From abe6d67368cd644c0cb94f0e2382d4a8dba071e6 Mon Sep 17 00:00:00 2001 From: David Lemaignent Date: Fri, 29 Oct 2021 15:19:39 +0200 Subject: [PATCH 1/3] update mariadb client --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb00d1ab8..462d72151 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ org.mariadb.jdbc mariadb-java-client - 2.7.1 + 2.7.3 org.springframework.boot From fa1be47e99848e1dfef834c27af032a420b1ea64 Mon Sep 17 00:00:00 2001 From: David Lemaignent Date: Fri, 29 Oct 2021 15:57:31 +0200 Subject: [PATCH 2/3] update application.yml --- pom.xml | 2 +- .../org/esupportail/esupsignature/config/fs/FsConfig.java | 4 ++-- .../service/interfaces/fs/vfs/VfsAccessImpl.java | 4 ++-- src/main/resources/application.yml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 462d72151..fb00d1ab8 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ org.mariadb.jdbc mariadb-java-client - 2.7.3 + 2.7.1 org.springframework.boot diff --git a/src/main/java/org/esupportail/esupsignature/config/fs/FsConfig.java b/src/main/java/org/esupportail/esupsignature/config/fs/FsConfig.java index 47dc18d5f..9f0c23cc3 100644 --- a/src/main/java/org/esupportail/esupsignature/config/fs/FsConfig.java +++ b/src/main/java/org/esupportail/esupsignature/config/fs/FsConfig.java @@ -48,7 +48,7 @@ public Properties smbProperties(){ } @Bean - @ConditionalOnProperty("fs.vfs-uri") + @ConditionalOnProperty("fs.vfs-test-uri") public VfsAccessImpl vfsAccessImpl(){ VfsAccessImpl vfsAccessImpl = new VfsAccessImpl(); vfsAccessImpl.setDriveName("VFS"); @@ -57,7 +57,7 @@ public VfsAccessImpl vfsAccessImpl(){ } @Bean - @ConditionalOnProperty("fs.cmis-uri") + @ConditionalOnProperty("fs.cmis-test-uri") public CmisAccessImpl cmisAccessImpl(){ CmisAccessImpl cmisAccessImpl = new CmisAccessImpl(); cmisAccessImpl.setDriveName("CMIS"); diff --git a/src/main/java/org/esupportail/esupsignature/service/interfaces/fs/vfs/VfsAccessImpl.java b/src/main/java/org/esupportail/esupsignature/service/interfaces/fs/vfs/VfsAccessImpl.java index 97e0cd876..42e5f2ab7 100644 --- a/src/main/java/org/esupportail/esupsignature/service/interfaces/fs/vfs/VfsAccessImpl.java +++ b/src/main/java/org/esupportail/esupsignature/service/interfaces/fs/vfs/VfsAccessImpl.java @@ -88,10 +88,10 @@ private FileObject open(String uri) { fsManager = VFS.getManager(); return fsManager.resolveFile(uri, fsOptions); } catch(FileSystemException e) { - logger.error("unable to open vfs", e); + logger.error("unable to open with vfs", e); return null; } catch (IllegalArgumentException e) { - logger.error("unable to open vfs " + e.getMessage()); + logger.error("unable to open with vfs " + uri); return null; } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 2ef519cf5..8653e079a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -147,8 +147,8 @@ fs: # smb-login: esup-signature # smb-password: password # smb-uri: smb://smb.univ-ville.fr - vfs-uri: /tmp -# cmis-uri: https://esup-signature.univ-ville.fr/nuxeo + vfs-test-uri: /tmp +# cmis-test-uri: https://esup-signature.univ-ville.fr/nuxeo # cmis-login: Administrator # cmis-password: Administrator # cmis-respository-id: default From af0c7bea3a58e7127582719d75f5c2de05820d7a Mon Sep 17 00:00:00 2001 From: David Lemaignent Date: Fri, 29 Oct 2021 16:08:22 +0200 Subject: [PATCH 3/3] clean logs --- .../esupportail/esupsignature/service/WorkflowService.java | 4 ++-- .../esupsignature/service/interfaces/fs/FsAccessFactory.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/esupportail/esupsignature/service/WorkflowService.java b/src/main/java/org/esupportail/esupsignature/service/WorkflowService.java index c378ebfd9..e66b75601 100644 --- a/src/main/java/org/esupportail/esupsignature/service/WorkflowService.java +++ b/src/main/java/org/esupportail/esupsignature/service/WorkflowService.java @@ -316,10 +316,10 @@ public int importFilesFromSource(Long workflowId, User user, User authUser) thro nbImportedFiles++; } } else { - logger.info("aucun fichier à importer depuis : " + workflow.getDocumentsSourceUri()); + logger.info("aucun fichier à importer depuis : " + workflow.getProtectedDocumentsSourceUri()); } } catch (Exception e) { - logger.error("error on import from " + workflow.getDocumentsSourceUri(), e); + logger.error("error on import from " + workflow.getProtectedDocumentsSourceUri(), e); } fsAccessService.close(); } else { diff --git a/src/main/java/org/esupportail/esupsignature/service/interfaces/fs/FsAccessFactory.java b/src/main/java/org/esupportail/esupsignature/service/interfaces/fs/FsAccessFactory.java index 585c8962d..0b9f8ad77 100644 --- a/src/main/java/org/esupportail/esupsignature/service/interfaces/fs/FsAccessFactory.java +++ b/src/main/java/org/esupportail/esupsignature/service/interfaces/fs/FsAccessFactory.java @@ -40,7 +40,6 @@ public void setCmisAccessImpl(CmisAccessImpl cmisAccessImpl) { public FsAccessService getFsAccessService(String uri) throws EsupSignatureFsException { DocumentIOType type = getPathIOType(uri); - logger.info("search type for " + uri + " result " + type); switch (type) { case smb: return smbAccessImpl;