This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 8d1d613f2a610e119bdd12c90cc5c2a157940891 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Oct 26 16:39:11 2016 +0200 #8677 Force refresh import file --- .../echobase/services/service/UserDbPersistenceService.java | 11 ++++++++--- .../service/importdata/actions/ImportDataActionSupport.java | 2 +- .../ifremer/echobase/ui/actions/exportAtlantos/Download.java | 1 - .../fr/ifremer/echobase/ui/actions/exportAtlantos/Export.java | 5 ----- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java index 76ba176..4d66229 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java @@ -108,8 +108,11 @@ import javax.sql.rowset.serial.SerialBlob; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -645,15 +648,17 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { ImportFile.PROPERTY_FILE, importFileBLob); } - public void addCheckedExportFile(ImportFile importFile, InputFile checkFile) { + public void addCheckedExportFile(String id, InputFile checkFile) { - Preconditions.checkNotNull(importFile); + Preconditions.checkNotNull(id); Preconditions.checkNotNull(checkFile); Preconditions.checkArgument(checkFile.hasFile()); SerialBlob checkFileBLob = getSerialBlob(checkFile.getFile()); + + ImportFile importFile = persistenceContext.getImportFileDao().forTopiaIdEquals(id).findUnique(); importFile.setCheckFile(checkFileBLob); - + flush(); } private SerialBlob getSerialBlob(File file) { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportDataActionSupport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportDataActionSupport.java index f0a41c6..b616cc5 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportDataActionSupport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportDataActionSupport.java @@ -254,7 +254,7 @@ public abstract class ImportDataActionSupport<M extends ImportDataConfigurationS } importFile.setImportText(importText.toString().trim()); - persistenceService.addCheckedExportFile(importFile, result.getImportedExportFile()); + persistenceService.addCheckedExportFile(importFile.getTopiaId(), result.getImportedExportFile()); } @Override diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportAtlantos/Download.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportAtlantos/Download.java index 3d92706..dc10efe 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportAtlantos/Download.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportAtlantos/Download.java @@ -22,7 +22,6 @@ package fr.ifremer.echobase.ui.actions.exportAtlantos; */ import fr.ifremer.echobase.services.service.atlantos.ExportAtlantosConfiguration; -import fr.ifremer.echobase.services.service.exportCoser.ExportCoserConfiguration; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import java.io.BufferedInputStream; diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportAtlantos/Export.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportAtlantos/Export.java index 9a5f1f7..1f0a761 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportAtlantos/Export.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportAtlantos/Export.java @@ -23,12 +23,7 @@ package fr.ifremer.echobase.ui.actions.exportAtlantos; import fr.ifremer.echobase.services.service.atlantos.ExportAtlantosConfiguration; import fr.ifremer.echobase.services.service.atlantos.ExportAtlantosService; -import fr.ifremer.echobase.ui.actions.exportCoser.*; -import fr.ifremer.echobase.services.service.exportCoser.ExportCoserConfiguration; -import fr.ifremer.echobase.services.service.exportCoser.ExportCoserService; -import fr.ifremer.echobase.services.service.exportCoser.GenerateCoserMapException; import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; -import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.