From 80e2ed0a47b1a8eff38d82f6dba357e0ad1de59d Mon Sep 17 00:00:00 2001 From: obfromevi Date: Fri, 28 Mar 2025 11:16:17 +0100 Subject: [PATCH] use of FileService to get fileStoreServicePovider --- .../business/user/attribute/AdminUserFieldHome.java | 4 ++-- .../business/user/attribute/AttributeImage.java | 3 ++- .../lutece/portal/business/xsl/XslExportHome.java | 3 ++- .../service/fileimage/FileImagePublicService.java | 9 ++++----- .../paris/lutece/portal/web/xsl/XslExportJspBean.java | 7 ++++--- .../lutece/portal/web/xsl/XslExportJspBeanTest.java | 11 ++++++++++- 6 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/java/fr/paris/lutece/portal/business/user/attribute/AdminUserFieldHome.java b/src/java/fr/paris/lutece/portal/business/user/attribute/AdminUserFieldHome.java index 831c18cb72..88f23d1765 100644 --- a/src/java/fr/paris/lutece/portal/business/user/attribute/AdminUserFieldHome.java +++ b/src/java/fr/paris/lutece/portal/business/user/attribute/AdminUserFieldHome.java @@ -35,7 +35,7 @@ import fr.paris.lutece.portal.business.file.FileHome; import fr.paris.lutece.portal.business.user.AdminUser; - +import fr.paris.lutece.portal.service.file.FileService; import fr.paris.lutece.portal.service.file.FileServiceException; import fr.paris.lutece.portal.service.file.IFileStoreServiceProvider; import fr.paris.lutece.portal.service.util.AppException; @@ -53,7 +53,7 @@ public final class AdminUserFieldHome { private static IAdminUserFieldDAO _dao = CDI.current().select( IAdminUserFieldDAO.class ).get( ); - private static IFileStoreServiceProvider _fileStoreService = CDI.current().select( IFileStoreServiceProvider.class ).get( ); + private static IFileStoreServiceProvider _fileStoreService = CDI.current().select( FileService.class ).get( ).getFileStoreServiceProvider( ); /** * Private constructor diff --git a/src/java/fr/paris/lutece/portal/business/user/attribute/AttributeImage.java b/src/java/fr/paris/lutece/portal/business/user/attribute/AttributeImage.java index e89bd081ed..6b42692657 100644 --- a/src/java/fr/paris/lutece/portal/business/user/attribute/AttributeImage.java +++ b/src/java/fr/paris/lutece/portal/business/user/attribute/AttributeImage.java @@ -37,6 +37,7 @@ import fr.paris.lutece.portal.business.physicalfile.PhysicalFile; import fr.paris.lutece.portal.business.physicalfile.PhysicalFileHome; import fr.paris.lutece.portal.business.user.AdminUser; +import fr.paris.lutece.portal.service.file.FileService; import fr.paris.lutece.portal.service.file.FileServiceException; import fr.paris.lutece.portal.service.file.IFileStoreServiceProvider; import fr.paris.lutece.portal.service.fileupload.FileUploadService; @@ -354,7 +355,7 @@ private void fillFileData( AdminUserField userField ) { try { - IFileStoreServiceProvider fileStoreService = CDI.current( ).select( IFileStoreServiceProvider.class ).get( ); + IFileStoreServiceProvider fileStoreService = CDI.current( ).select( FileService.class ).get( ).getFileStoreServiceProvider( ); File file = fileStoreService.getFile( userField.getFile( ).getFileKey( ) ); userField.setFile( file ); diff --git a/src/java/fr/paris/lutece/portal/business/xsl/XslExportHome.java b/src/java/fr/paris/lutece/portal/business/xsl/XslExportHome.java index 51d9022f0b..c5a2f66999 100644 --- a/src/java/fr/paris/lutece/portal/business/xsl/XslExportHome.java +++ b/src/java/fr/paris/lutece/portal/business/xsl/XslExportHome.java @@ -33,6 +33,7 @@ */ package fr.paris.lutece.portal.business.xsl; +import fr.paris.lutece.portal.service.file.FileService; import fr.paris.lutece.portal.service.file.FileServiceException; import fr.paris.lutece.portal.service.file.IFileStoreServiceProvider; import fr.paris.lutece.portal.service.html.XmlTransformerService; @@ -51,7 +52,7 @@ public final class XslExportHome // Static variable pointed at the DAO instance private static IXslExportDAO _dao = CDI.current().select( IXslExportDAO.class ).get(); - private static IFileStoreServiceProvider _fileStoreService = CDI.current().select( IFileStoreServiceProvider.class ).get( ) ; + private static IFileStoreServiceProvider _fileStoreService = CDI.current().select( FileService.class ).get( ).getFileStoreServiceProvider( ); /** * Private constructor - this class do not need to be instantiated diff --git a/src/java/fr/paris/lutece/portal/service/fileimage/FileImagePublicService.java b/src/java/fr/paris/lutece/portal/service/fileimage/FileImagePublicService.java index 633d9dca8a..bfff1b78ea 100644 --- a/src/java/fr/paris/lutece/portal/service/fileimage/FileImagePublicService.java +++ b/src/java/fr/paris/lutece/portal/service/fileimage/FileImagePublicService.java @@ -39,8 +39,8 @@ import fr.paris.lutece.portal.business.file.File; import fr.paris.lutece.portal.service.cache.Lutece107Cache; import fr.paris.lutece.portal.service.cache.LuteceCache; +import fr.paris.lutece.portal.service.file.FileService; import fr.paris.lutece.portal.service.file.FileServiceException; -import fr.paris.lutece.portal.service.file.IFileStoreServiceProvider; import fr.paris.lutece.portal.service.image.ImageResource; import fr.paris.lutece.portal.service.image.ImageResourceManager; import fr.paris.lutece.portal.service.image.ImageResourceProvider; @@ -64,9 +64,8 @@ public class FileImagePublicService implements ImageResourceProvider public static final String IMAGE_RESOURCE_TYPE_ID = "public_image_resource"; @Inject - private transient IFileStoreServiceProvider _fileStoreService; + private transient FileService _fileService; - /** * Init * @@ -134,7 +133,7 @@ public ImageResource getImageResource( int nIdResource ) /*if no cache*/ try { - File file = _fileStoreService.getFile( String.valueOf( nIdResource ) ); + File file = _fileService.getFileStoreServiceProvider( ).getFile( String.valueOf( nIdResource ) ); if ( ( file != null ) && ( file.getPhysicalFile( ) != null ) && FileUtil.hasImageExtension( file.getTitle( ) ) ) { @@ -165,7 +164,7 @@ public String addImageResource( FileItem fileItem ) { try { - return _fileStoreService.storeFileItem( fileItem ) ; + return _fileService.getFileStoreServiceProvider( ).storeFileItem( fileItem ) ; } catch ( FileServiceException e ) { diff --git a/src/java/fr/paris/lutece/portal/web/xsl/XslExportJspBean.java b/src/java/fr/paris/lutece/portal/web/xsl/XslExportJspBean.java index 376cbee029..775d0559ca 100644 --- a/src/java/fr/paris/lutece/portal/web/xsl/XslExportJspBean.java +++ b/src/java/fr/paris/lutece/portal/web/xsl/XslExportJspBean.java @@ -42,6 +42,7 @@ import fr.paris.lutece.portal.business.xsl.XslExport; import fr.paris.lutece.portal.business.xsl.XslExportHome; import fr.paris.lutece.portal.service.admin.AccessDeniedException; +import fr.paris.lutece.portal.service.file.FileService; import fr.paris.lutece.portal.service.file.FileServiceException; import fr.paris.lutece.portal.service.file.IFileStoreServiceProvider; import fr.paris.lutece.portal.service.fileupload.FileUploadService; @@ -147,11 +148,11 @@ public class XslExportJspBean extends PluginAdminPageJspBean private transient IFileStoreServiceProvider _fileStoreService; @Inject - public XslExportJspBean( IFileStoreServiceProvider fileStoreService ) + public XslExportJspBean( FileService fileService ) { - _fileStoreService = fileStoreService; + _fileStoreService = fileService.getFileStoreServiceProvider( ); } - + /** * Gets the xsl export creation page * diff --git a/src/test/java/fr/paris/lutece/portal/web/xsl/XslExportJspBeanTest.java b/src/test/java/fr/paris/lutece/portal/web/xsl/XslExportJspBeanTest.java index 7438d8a315..3acda2e940 100644 --- a/src/test/java/fr/paris/lutece/portal/web/xsl/XslExportJspBeanTest.java +++ b/src/test/java/fr/paris/lutece/portal/web/xsl/XslExportJspBeanTest.java @@ -48,6 +48,7 @@ import org.apache.commons.fileupload2.core.DiskFileItemFactory; import org.apache.commons.fileupload2.core.FileItem; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -59,6 +60,7 @@ import fr.paris.lutece.portal.business.xsl.XslExport; import fr.paris.lutece.portal.business.xsl.XslExportHome; import fr.paris.lutece.portal.service.admin.AccessDeniedException; +import fr.paris.lutece.portal.service.file.FileService; import fr.paris.lutece.portal.service.file.IFileStoreServiceProvider; import fr.paris.lutece.portal.service.message.AdminMessage; import fr.paris.lutece.portal.service.message.AdminMessageService; @@ -75,8 +77,15 @@ public class XslExportJspBeanTest extends LuteceTestCase private XslExportJspBean _instance; private XslExport _xslExport; private @Inject ISecurityTokenService _securityTokenService; - private @Inject IFileStoreServiceProvider _fileStoreService; + private @Inject FileService _fileService; + private IFileStoreServiceProvider _fileStoreService; + @BeforeAll + protected void initTest( ) + { + _fileStoreService = _fileService.getFileStoreServiceProvider( ); + } + @BeforeEach protected void setUp( ) throws Exception {