Skip to content

LUT-29770 : use of FileService to get fileStoreServicePovider #515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop8.x
Choose a base branch
from
Open

LUT-29770 : use of FileService to get fileStoreServicePovider #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/java/fr/paris/lutece/portal/business/user/attribute/AdminUserFieldHome.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/java/fr/paris/lutece/portal/business/user/attribute/AttributeImage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 );

Expand Down
3 changes: 2 additions & 1 deletion src/java/fr/paris/lutece/portal/business/xsl/XslExportHome.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
9 changes: 4 additions & 5 deletions src/java/fr/paris/lutece/portal/service/fileimage/FileImagePublicService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
*
Expand Down Expand Up @@ -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( ) ) )
{
Expand Down Expand Up @@ -165,7 +164,7 @@ public String addImageResource( FileItem<DiskFileItem> fileItem )
{
try
{
return _fileStoreService.storeFileItem( fileItem ) ;
return _fileService.getFileStoreServiceProvider( ).storeFileItem( fileItem ) ;
}
catch ( FileServiceException e )
{
Expand Down
7 changes: 4 additions & 3 deletions src/java/fr/paris/lutece/portal/web/xsl/XslExportJspBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
*
Expand Down
11 changes: 10 additions & 1 deletion src/test/java/fr/paris/lutece/portal/web/xsl/XslExportJspBeanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand All @@ -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
{
Expand Down