From 4e08ef7d7cdd59607ba97092fc11644721b6d839 Mon Sep 17 00:00:00 2001
From: evdngsl <158455076+evdngsl@users.noreply.github.com>
Date: Tue, 22 Jul 2025 14:37:02 +0200
Subject: [PATCH 1/2] LUT-30399 : Repository pattern implementation

---
 .../fr/paris/lutece/data/dao/IGenericDAO.java |  89 +++++++++++++
 .../lutece/data/repository/DAORepository.java | 120 ++++++++++++++++++
 .../lutece/data/repository/IRepository.java   |  92 ++++++++++++++
 3 files changed, 301 insertions(+)
 create mode 100644 src/java/fr/paris/lutece/data/dao/IGenericDAO.java
 create mode 100644 src/java/fr/paris/lutece/data/repository/DAORepository.java
 create mode 100644 src/java/fr/paris/lutece/data/repository/IRepository.java

diff --git a/src/java/fr/paris/lutece/data/dao/IGenericDAO.java b/src/java/fr/paris/lutece/data/dao/IGenericDAO.java
new file mode 100644
index 000000000..4ae731551
--- /dev/null
+++ b/src/java/fr/paris/lutece/data/dao/IGenericDAO.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2002-2025, City of Paris
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright notice
+ *     and the following disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above copyright notice
+ *     and the following disclaimer in the documentation and/or other materials
+ *     provided with the distribution.
+ *
+ *  3. Neither the name of 'Mairie de Paris' nor 'Lutece' nor the names of its
+ *     contributors may be used to endorse or promote products derived from
+ *     this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * License 1.0
+ */
+package fr.paris.lutece.data.dao;
+
+import java.util.Collection;
+
+/**
+ * Generic Data Access Object (DAO) interface for CRUD operations on entities.
+ * <p>
+ * Provides methods to insert, update, delete, load, and select all entities of type {@code T} identified by {@code ID}.
+ *
+ * @param <T>
+ *            the entity type
+ * @param <ID>
+ *            the type of the entity's identifier
+ */
+public interface IGenericDAO<T, ID>
+{
+    /**
+     * Inserts a new entity into the data store.
+     *
+     * @param paramT
+     *            the entity to insert
+     */
+    void insert( T paramT );
+
+    /**
+     * Updates an existing entity in the data store.
+     *
+     * @param paramT
+     *            the entity to update
+     */
+    void store( T paramT );
+
+    /**
+     * Deletes an entity by its identifier.
+     *
+     * @param paramID
+     *            the identifier of the entity to delete
+     */
+    void delete( ID paramID );
+
+    /**
+     * Loads an entity by its identifier.
+     *
+     * @param paramID
+     *            the identifier of the entity to load
+     * @return the entity if found, or {@code null} if not found
+     */
+    T load( ID paramID );
+
+    /**
+     * Selects all entities from the data store.
+     *
+     * @return a collection of all entities
+     */
+    Collection<T> selectAll( );
+}
diff --git a/src/java/fr/paris/lutece/data/repository/DAORepository.java b/src/java/fr/paris/lutece/data/repository/DAORepository.java
new file mode 100644
index 000000000..e739820e2
--- /dev/null
+++ b/src/java/fr/paris/lutece/data/repository/DAORepository.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2002-2025, City of Paris
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright notice
+ *     and the following disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above copyright notice
+ *     and the following disclaimer in the documentation and/or other materials
+ *     provided with the distribution.
+ *
+ *  3. Neither the name of 'Mairie de Paris' nor 'Lutece' nor the names of its
+ *     contributors may be used to endorse or promote products derived from
+ *     this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * License 1.0
+ */
+package fr.paris.lutece.data.repository;
+
+import java.util.Collection;
+import java.util.Optional;
+
+import fr.paris.lutece.data.dao.IGenericDAO;
+
+/**
+ * Abstract base repository providing CRUD operations using a generic DAO.
+ * <p>
+ * This class implements common repository methods and delegates persistence operations to an underlying {@link IGenericDAO} implementation.
+ *
+ * @param <T>
+ *            the entity type
+ * @param <ID>
+ *            the type of the entity's identifier
+ */
+public abstract class DAORepository<T, ID> implements IRepository<T, ID>
+{
+
+    /**
+     * Gets the DAO instance used for persistence operations.
+     *
+     * @return the generic DAO
+     */
+    protected abstract IGenericDAO<T, ID> getDAO( );
+
+    /**
+     * Creates a new entity in the data store.
+     *
+     * @param paramT
+     *            the entity to create
+     * @return the created entity
+     */
+    public T create( T paramT )
+    {
+        getDAO( ).insert( paramT );
+        return paramT;
+    }
+
+    /**
+     * Updates an existing entity in the data store.
+     *
+     * @param paramT
+     *            the entity to update
+     * @return the updated entity
+     */
+    public T update( T paramT )
+    {
+        getDAO( ).store( paramT );
+        return paramT;
+    }
+
+    /**
+     * Removes an entity by its identifier.
+     *
+     * @param paramID
+     *            the identifier of the entity to remove
+     */
+    public void remove( ID paramID )
+    {
+        getDAO( ).delete( paramID );
+    }
+
+    /**
+     * Loads an entity by its identifier.
+     *
+     * @param paramID
+     *            the identifier of the entity to load
+     * @return an {@link Optional} containing the entity if found, or empty if not found
+     */
+    public Optional<T> load( ID paramID )
+    {
+        return Optional.ofNullable( getDAO( ).load( paramID ) );
+    }
+
+    /**
+     * Finds all entities in the data store.
+     *
+     * @return a collection of all entities
+     */
+    public Collection<T> findAll( )
+    {
+        return getDAO( ).selectAll( );
+    }
+
+}
diff --git a/src/java/fr/paris/lutece/data/repository/IRepository.java b/src/java/fr/paris/lutece/data/repository/IRepository.java
new file mode 100644
index 000000000..2c3a152f2
--- /dev/null
+++ b/src/java/fr/paris/lutece/data/repository/IRepository.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2002-2025, City of Paris
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright notice
+ *     and the following disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above copyright notice
+ *     and the following disclaimer in the documentation and/or other materials
+ *     provided with the distribution.
+ *
+ *  3. Neither the name of 'Mairie de Paris' nor 'Lutece' nor the names of its
+ *     contributors may be used to endorse or promote products derived from
+ *     this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * License 1.0
+ */
+package fr.paris.lutece.data.repository;
+
+import java.util.Collection;
+import java.util.Optional;
+
+/**
+ * Generic repository interface for CRUD operations on entities.
+ * <p>
+ * Provides methods to create, update, remove, load, and list all entities of type {@code T} identified by {@code ID}.
+ *
+ * @param <T>
+ *            the entity type
+ * @param <ID>
+ *            the type of the entity's identifier
+ */
+public interface IRepository<T, ID>
+{
+    /**
+     * Creates a new entity in the data store.
+     *
+     * @param paramT
+     *            the entity to create
+     * @return the created entity
+     */
+    T create( T paramT );
+
+    /**
+     * Updates an existing entity in the data store.
+     *
+     * @param paramT
+     *            the entity to update
+     * @return the updated entity
+     */
+    T update( T paramT );
+
+    /**
+     * Removes an entity by its identifier.
+     *
+     * @param paramID
+     *            the identifier of the entity to remove
+     */
+    void remove( ID paramID );
+
+    /**
+     * Loads an entity by its identifier.
+     *
+     * @param paramID
+     *            the identifier of the entity to load
+     * @return an {@link Optional} containing the entity if found, or empty if not found
+     */
+    Optional<T> load( ID paramID );
+
+    /**
+     * Finds all entities in the data store.
+     *
+     * @return a collection of all entities
+     */
+    Collection<T> findAll( );
+}

From a1f865877c775749a36eb5782d0d5d18a8b49878 Mon Sep 17 00:00:00 2001
From: evdngsl <158455076+evdngsl@users.noreply.github.com>
Date: Tue, 22 Jul 2025 14:38:05 +0200
Subject: [PATCH 2/2] LUT-30399 : Repository pattern applied to Style features
 (mode, style, stylesheet, pagetemplate)

---
 .../business/style/IModeRepository.java       |  47 +++++
 .../business/style/IPageTemplateDAO.java      |  46 +----
 .../style/IPageTemplateRepository.java        |  41 +++++
 .../portal/business/style/IStyleDAO.java      |  42 +----
 .../business/style/IStyleRepository.java      |  51 +++++
 .../portal/business/style/ModeHome.java       | 134 +++-----------
 .../portal/business/style/ModeRepository.java | 174 ++++++++++++++++++
 .../business/style/PageTemplateDAO.java       |   9 +-
 .../business/style/PageTemplateHome.java      |  82 ++-------
 .../style/PageTemplateRepository.java         |  60 ++++++
 .../portal/business/style/StyleDAO.java       |   7 +-
 .../portal/business/style/StyleHome.java      |  89 ++-------
 .../business/style/StyleRepository.java       |  76 ++++++++
 .../business/stylesheet/IStyleSheetDAO.java   |  19 +-
 .../stylesheet/IStyleSheetRepository.java     |  47 +++++
 .../business/stylesheet/StyleSheetDAO.java    |  37 +---
 .../business/stylesheet/StyleSheetHome.java   |  76 ++------
 .../stylesheet/StyleSheetRepository.java      |  84 +++++++++
 .../portal/service/page/PageService.java      |   7 +-
 .../service/portal/PortalMenuService.java     |   6 +-
 .../portal/service/portal/PortalService.java  |  10 +-
 .../portal/service/style/IStyleService.java   |  33 ++++
 .../portal/service/style/StyleService.java    |  86 +++++++++
 .../portal/web/admin/AdminMapJspBean.java     |   8 +-
 .../portal/web/admin/AdminPageJspBean.java    |  10 +-
 .../portal/web/includes/TreeMenuInclude.java  |   8 +-
 .../web/style/PageTemplatesJspBean.java       |  20 +-
 .../portal/web/style/StylesJspBean.java       |  30 +--
 .../web/stylesheet/StyleSheetFileServlet.java |  14 +-
 .../web/stylesheet/StyleSheetJspBean.java     |  36 ++--
 .../lutece/portal/web/xpages/SiteMapApp.java  |   8 +-
 .../portal/business/page/PageDAOTest.java     |   6 +-
 .../business/style/PageTemplateTest.java      |  22 ++-
 .../portal/business/style/StyleTest.java      |  28 +--
 .../business/stylesheet/StyleSheetTest.java   |  22 ++-
 .../web/admin/AdminPageJspBeanTest.java       |   8 +-
 .../web/style/PageTemplatesJspBeanTest.java   |  54 +++---
 .../portal/web/style/StylesJspBeanTest.java   |  59 +++---
 .../web/stylesheet/StyleSheetJspBeanTest.java |  51 ++---
 .../web/xpages/SiteMapAppCycleTest.java       |   6 +-
 .../portal/web/xpages/SiteMapAppTest.java     |  18 +-
 41 files changed, 1036 insertions(+), 635 deletions(-)
 create mode 100644 src/java/fr/paris/lutece/portal/business/style/IModeRepository.java
 create mode 100644 src/java/fr/paris/lutece/portal/business/style/IPageTemplateRepository.java
 create mode 100644 src/java/fr/paris/lutece/portal/business/style/IStyleRepository.java
 create mode 100644 src/java/fr/paris/lutece/portal/business/style/ModeRepository.java
 create mode 100644 src/java/fr/paris/lutece/portal/business/style/PageTemplateRepository.java
 create mode 100644 src/java/fr/paris/lutece/portal/business/style/StyleRepository.java
 create mode 100644 src/java/fr/paris/lutece/portal/business/stylesheet/IStyleSheetRepository.java
 create mode 100644 src/java/fr/paris/lutece/portal/business/stylesheet/StyleSheetRepository.java
 create mode 100644 src/java/fr/paris/lutece/portal/service/style/IStyleService.java
 create mode 100644 src/java/fr/paris/lutece/portal/service/style/StyleService.java

diff --git a/src/java/fr/paris/lutece/portal/business/style/IModeRepository.java b/src/java/fr/paris/lutece/portal/business/style/IModeRepository.java
new file mode 100644
index 000000000..b1ad5eb71
--- /dev/null
+++ b/src/java/fr/paris/lutece/portal/business/style/IModeRepository.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2002-2025, City of Paris
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright notice
+ *     and the following disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above copyright notice
+ *     and the following disclaimer in the documentation and/or other materials
+ *     provided with the distribution.
+ *
+ *  3. Neither the name of 'Mairie de Paris' nor 'Lutece' nor the names of its
+ *     contributors may be used to endorse or promote products derived from
+ *     this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * License 1.0
+ */
+package fr.paris.lutece.portal.business.style;
+
+import java.util.Properties;
+
+import fr.paris.lutece.util.ReferenceList;
+
+public interface IModeRepository
+{
+    Mode load( int nId );
+
+    ReferenceList findAllToReferenceList( );
+
+    Properties findOuputXslProperties( int nId );
+}
diff --git a/src/java/fr/paris/lutece/portal/business/style/IPageTemplateDAO.java b/src/java/fr/paris/lutece/portal/business/style/IPageTemplateDAO.java
index 6b59b8a74..e1384ecc4 100644
--- a/src/java/fr/paris/lutece/portal/business/style/IPageTemplateDAO.java
+++ b/src/java/fr/paris/lutece/portal/business/style/IPageTemplateDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2022, City of Paris
+ * Copyright (c) 2002-2025, City of Paris
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,54 +33,14 @@
  */
 package fr.paris.lutece.portal.business.style;
 
-import java.util.List;
+import fr.paris.lutece.data.dao.IGenericDAO;
 
 /**
  *
  * @author LEVY
  */
-public interface IPageTemplateDAO
+public interface IPageTemplateDAO extends IGenericDAO<PageTemplate, Integer>
 {
-    /**
-     * Delete a record from the table
-     *
-     * @param nPageTemplateId
-     *            The indentifier of the object PageTemplate
-     */
-    void delete( int nPageTemplateId );
-
-    /**
-     * Insert a new record in the table.
-     *
-     * @param pageTemplate
-     *            The Instance of the object PageTemplate
-     */
-    void insert( PageTemplate pageTemplate );
-
-    /**
-     * load the data of PageTemplate from the table
-     *
-     *
-     * @param nPageTemplateId
-     *            The indentifier of the object PageTemplate
-     * @return The Instance of the object PageTemplate
-     */
-    PageTemplate load( int nPageTemplateId );
-
-    /**
-     * Returns a list of all the page templates
-     *
-     * @return A list of PageTemplates objects
-     */
-    List<PageTemplate> selectPageTemplatesList( );
-
-    /**
-     * Update the record in the table
-     *
-     * @param pageTemplate
-     *            The instance of the PageTemplate to update
-     */
-    void store( PageTemplate pageTemplate );
 
     /**
      * Checks if a page template has been used by a page
diff --git a/src/java/fr/paris/lutece/portal/business/style/IPageTemplateRepository.java b/src/java/fr/paris/lutece/portal/business/style/IPageTemplateRepository.java
new file mode 100644
index 000000000..3e4b0e6ed
--- /dev/null
+++ b/src/java/fr/paris/lutece/portal/business/style/IPageTemplateRepository.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2002-2025, City of Paris
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright notice
+ *     and the following disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above copyright notice
+ *     and the following disclaimer in the documentation and/or other materials
+ *     provided with the distribution.
+ *
+ *  3. Neither the name of 'Mairie de Paris' nor 'Lutece' nor the names of its
+ *     contributors may be used to endorse or promote products derived from
+ *     this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * License 1.0
+ */
+package fr.paris.lutece.portal.business.style;
+
+import fr.paris.lutece.data.repository.IRepository;
+
+public interface IPageTemplateRepository extends IRepository<PageTemplate, Integer>
+{
+    boolean isUsedByPage( int nPageTemplateId );
+}
diff --git a/src/java/fr/paris/lutece/portal/business/style/IStyleDAO.java b/src/java/fr/paris/lutece/portal/business/style/IStyleDAO.java
index 31516528f..14e3ad225 100644
--- a/src/java/fr/paris/lutece/portal/business/style/IStyleDAO.java
+++ b/src/java/fr/paris/lutece/portal/business/style/IStyleDAO.java
@@ -33,6 +33,7 @@
  */
 package fr.paris.lutece.portal.business.style;
 
+import fr.paris.lutece.data.dao.IGenericDAO;
 import fr.paris.lutece.portal.business.stylesheet.StyleSheet;
 import fr.paris.lutece.util.ReferenceList;
 
@@ -42,7 +43,7 @@
  *
  * @author LEVY
  */
-public interface IStyleDAO
+public interface IStyleDAO extends IGenericDAO<Style, Integer>
 {
     /**
      * Checks if a style has been created in the database with the given portal componenet
@@ -53,31 +54,6 @@ public interface IStyleDAO
      */
     boolean checkStylePortalComponent( int nPortalComponentId );
 
-    /**
-     * Delete a record from the table
-     *
-     * @param nStyleId
-     *            the identifier of the style to delete
-     */
-    void delete( int nStyleId );
-
-    /**
-     * Insert a new record in the table.
-     *
-     * @param style
-     *            The Instance of the object Style
-     */
-    void insert( Style style );
-
-    /**
-     * load the data of the Style whose identifier is specified in parameter from the table
-     *
-     * @param nStyleId
-     *            The identifier of the Style
-     * @return an instance of the Style which has been created
-     */
-    Style load( int nStyleId );
-
     /**
      * Returns the list of the portal component in form of a ReferenceList
      *
@@ -95,18 +71,4 @@ public interface IStyleDAO
      */
     Collection<StyleSheet> selectStyleSheetList( int nStyleId );
 
-    /**
-     * Load the list of styles stored in the database
-     *
-     * @return The styles list in form of a Collection object
-     */
-    Collection<Style> selectStylesList( );
-
-    /**
-     * Update the record in the table
-     *
-     * @param style
-     *            The instance of the Style to update
-     */
-    void store( Style style );
 }
diff --git a/src/java/fr/paris/lutece/portal/business/style/IStyleRepository.java b/src/java/fr/paris/lutece/portal/business/style/IStyleRepository.java
new file mode 100644
index 000000000..f8cda19b2
--- /dev/null
+++ b/src/java/fr/paris/lutece/portal/business/style/IStyleRepository.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2002-2025, City of Paris
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright notice
+ *     and the following disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above copyright notice
+ *     and the following disclaimer in the documentation and/or other materials
+ *     provided with the distribution.
+ *
+ *  3. Neither the name of 'Mairie de Paris' nor 'Lutece' nor the names of its
+ *     contributors may be used to endorse or promote products derived from
+ *     this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * License 1.0
+ */
+package fr.paris.lutece.portal.business.style;
+
+import java.util.Collection;
+
+import fr.paris.lutece.data.repository.IRepository;
+import fr.paris.lutece.portal.business.stylesheet.StyleSheet;
+import fr.paris.lutece.util.ReferenceList;
+
+public interface IStyleRepository extends IRepository<Style, Integer>
+{
+
+    ReferenceList findPortalComponents( );
+
+    boolean existsPortalComponentForStyle( int nPortalComponentId );
+
+    Collection<StyleSheet> findStyleSheetsByStyle( int nStyleId );
+
+}
diff --git a/src/java/fr/paris/lutece/portal/business/style/ModeHome.java b/src/java/fr/paris/lutece/portal/business/style/ModeHome.java
index e12862b09..d4aa46087 100644
--- a/src/java/fr/paris/lutece/portal/business/style/ModeHome.java
+++ b/src/java/fr/paris/lutece/portal/business/style/ModeHome.java
@@ -33,27 +33,20 @@
  */
 package fr.paris.lutece.portal.business.style;
 
-import fr.paris.lutece.util.ReferenceList;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
 import java.util.Properties;
-import java.util.TreeMap;
-
-import javax.xml.transform.OutputKeys;
 
-import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.ConfigProvider;
+import fr.paris.lutece.portal.service.style.IStyleService;
+import fr.paris.lutece.util.ReferenceList;
+import jakarta.enterprise.inject.spi.CDI;
 
 /**
  * This class provides instances management methods (create, find, ...) for Mode objects
  */
+@Deprecated( since = "8.0", forRemoval = true )
 public final class ModeHome
 {
-    private static final Config _config = ConfigProvider.getConfig( );
-    private static Map<Integer, Mode> _modes;
-    
+    private static IModeRepository _repository = CDI.current( ).select( IModeRepository.class ).get( );
+
     /**
      * Creates a new ModeHome object.
      */
@@ -69,129 +62,44 @@ private ModeHome( )
      *
      * @param nKey
      *            The mode primary key
+     * @deprecated From the core use {@code @Inject} to obtain the {@link IModeRepository} instance and access the method {@link IModeRepository#load(int)}. 
+     *             From a plugin use {@code @Inject} to obtain the {@link IStyleService} instance and access the method {@link IStyleService#findModeById(int)}. 
+     *             This method will be removed in future versions.
      * @return an instance of a mode
      */
+    @Deprecated( since = "8.0", forRemoval = true )
     public static Mode findByPrimaryKey( int nKey )
     {
-        if (null == _modes)
-        {
-            initModes();
-        }
-        return _modes.get( nKey );
-    }
-
-    private static synchronized void initModes( )
-    {
-        List<Integer> modeIds = _config.getOptionalValues( "lutece.style.modes", Integer.class ).orElse( new ArrayList<Integer>( ) );
-        _modes = new TreeMap<Integer, Mode>( );
-
-        for ( Integer id : modeIds )
-        {
-            Mode mode = new Mode( );
-            String strDescription = _config.getOptionalValue( "lutece.style.mode." + id + ".description", String.class ).orElse( null );
-            String strPath = _config.getOptionalValue( "lutece.style.mode." + id + ".path", String.class ).orElse( null );
-            String strMethod = _config.getOptionalValue( "lutece.style.mode." + id + ".outputXslMethod", String.class ).orElse( "xml" );
-            String strVersion = _config.getOptionalValue( "lutece.style.mode." + id + ".outputXslVersion", String.class ).orElse( "1.0" );
-            String strEncoding = _config.getOptionalValue( "lutece.style.mode." + id + ".outputXslEncoding", String.class ).orElse( "UTF-8" );
-            String strIndent = _config.getOptionalValue( "lutece.style.mode." + id + ".outputXslIndent", String.class ).orElse( "yes" );
-            String strOmitXmlDeclaration = _config.getOptionalValue( "lutece.style.mode." + id + ".outputXslOmitXmlDec", String.class ).orElse( "yes" );
-            String strMediaType = _config.getOptionalValue( "lutece.style.mode." + id + ".outputXslMediaType", String.class ).orElse( "text/xml" );
-            String strStandalone = _config.getOptionalValue( "lutece.style.mode." + id + ".outputXslStandalone", String.class ).orElse( null );
-            mode.setId( id );
-            mode.setDescription( strDescription );
-            mode.setPath( strPath );
-            mode.setOutputXslPropertyMethod( strMethod );
-            mode.setOutputXslPropertyVersion( strVersion );
-            mode.setOutputXslPropertyEncoding( strEncoding );
-            mode.setOutputXslPropertyIndent( strIndent );
-            mode.setOutputXslPropertyOmitXmlDeclaration( strOmitXmlDeclaration );
-            mode.setOutputXslPropertyMediaType( strMediaType );
-            mode.setOutputXslPropertyStandalone( strStandalone );
-            _modes.put( id, mode );
-        }
+        return _repository.load( nKey );
     }
 
     /**
      * Returns a reference list which contains all the modes
      *
+     * @deprecated From the core use {@code @Inject} to obtain the {@link IModeRepository} instance and access the method {@link IModeRepository#findAllToReferenceList()}. 
+     *             From a plugin use {@code @Inject} to obtain the {@link IStyleService} instance and access the method {@link IStyleService#findModesToReferenceList()}. 
+     *             This method will be removed in future versions.
      * @return a reference list
      */
+    @Deprecated( since = "8.0", forRemoval = true )
     public static ReferenceList getModes( )
     {
-        if (null == _modes)
-        {
-            initModes();
-        }
-        
-        ReferenceList modesList = new ReferenceList( );
-        for ( Mode mode : _modes.values( ) )
-        {
-            modesList.addItem( mode.getId( ), mode.getDescription( ) );
-        }
-        return modesList;
+        return _repository.findAllToReferenceList( );
     }
 
     /**
      * Returns a set of properties used for xsl output
      *
+     * @deprecated From the core use {@code @Inject} to obtain the {@link IModeRepository} instance and access the method {@link IModeRepository#findOuputXslProperties(int)}. 
+     *             From a plugin use {@code @Inject} to obtain the {@link IStyleService} instance and access the method {@link IStyleService#findModeXlsOutputProperties(int)}. 
+     *             This method will be removed in future versions.
      * @param nKey
      *            The mode primary key
      * @return the output properties to use for xsl transformation
      */
+    @Deprecated( since = "8.0", forRemoval = true )
     public static Properties getOuputXslProperties( int nKey )
     {
-        Mode mode = findByPrimaryKey( nKey );
-        Properties ouputProperties = new Properties( );
-
-        String strMethod = mode.getOutputXslPropertyMethod( );
-
-        if ( ( strMethod != null ) && ( !strMethod.trim( ).equals( "" ) ) )
-        {
-            ouputProperties.setProperty( OutputKeys.METHOD, strMethod );
-        }
-
-        String strVersion = mode.getOutputXslPropertyVersion( );
-
-        if ( ( strVersion != null ) && ( !strVersion.trim( ).equals( "" ) ) )
-        {
-            ouputProperties.setProperty( OutputKeys.VERSION, strVersion );
-        }
-
-        String strEncoding = mode.getOutputXslPropertyEncoding( );
-
-        if ( ( strEncoding != null ) && ( !strEncoding.trim( ).equals( "" ) ) )
-        {
-            ouputProperties.setProperty( OutputKeys.ENCODING, strEncoding );
-        }
-
-        String strIndent = mode.getOutputXslPropertyIndent( );
-
-        if ( ( strIndent != null ) && ( !strIndent.trim( ).equals( "" ) ) )
-        {
-            ouputProperties.setProperty( OutputKeys.INDENT, strIndent );
-        }
-
-        String strOmitXmlDeclaration = mode.getOutputXslPropertyOmitXmlDeclaration( );
-
-        if ( ( strOmitXmlDeclaration != null ) && ( !strOmitXmlDeclaration.trim( ).equals( "" ) ) )
-        {
-            ouputProperties.setProperty( OutputKeys.OMIT_XML_DECLARATION, strOmitXmlDeclaration );
-        }
-
-        String strMediaType = mode.getOutputXslPropertyMediaType( );
-
-        if ( ( strMediaType != null ) && ( !strMediaType.trim( ).equals( "" ) ) )
-        {
-            ouputProperties.setProperty( OutputKeys.MEDIA_TYPE, strMediaType );
-        }
-
-        String strStandalone = mode.getOutputXslPropertyStandalone( );
-
-        if ( ( strStandalone != null ) && ( !strStandalone.trim( ).equals( "" ) ) )
-        {
-            ouputProperties.setProperty( OutputKeys.STANDALONE, strStandalone );
-        }
-
-        return ouputProperties;
+        return _repository.findOuputXslProperties( nKey );
     }
 }
diff --git a/src/java/fr/paris/lutece/portal/business/style/ModeRepository.java b/src/java/fr/paris/lutece/portal/business/style/ModeRepository.java
new file mode 100644
index 000000000..fff9a79fd
--- /dev/null
+++ b/src/java/fr/paris/lutece/portal/business/style/ModeRepository.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2002-2025, City of Paris
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright notice
+ *     and the following disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above copyright notice
+ *     and the following disclaimer in the documentation and/or other materials
+ *     provided with the distribution.
+ *
+ *  3. Neither the name of 'Mairie de Paris' nor 'Lutece' nor the names of its
+ *     contributors may be used to endorse or promote products derived from
+ *     this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * License 1.0
+ */
+package fr.paris.lutece.portal.business.style;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeMap;
+
+import javax.xml.transform.OutputKeys;
+
+import org.eclipse.microprofile.config.Config;
+
+import fr.paris.lutece.util.ReferenceList;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
+@ApplicationScoped
+public class ModeRepository implements IModeRepository
+{
+
+    private static final String MODES_PROPERTY = "lutece.style.modes";
+    private static final String MODE_PROPERTY_PREFIX = "lutece.style.mode.";
+
+    @Inject
+    private Config _config;
+    private Map<Integer, Mode> _modes;
+
+    @PostConstruct
+    void init( )
+    {
+        initModes( );
+    }
+
+    private synchronized void initModes( )
+    {
+        List<Integer> modeIds = _config.getOptionalValues( MODES_PROPERTY, Integer.class ).orElse( new ArrayList<Integer>( ) );
+        _modes = new TreeMap<Integer, Mode>( );
+
+        for ( Integer id : modeIds )
+        {
+            Mode mode = new Mode( );
+            String strDescription = _config.getOptionalValue( MODE_PROPERTY_PREFIX + id + ".description", String.class ).orElse( null );
+            String strPath = _config.getOptionalValue( MODE_PROPERTY_PREFIX + id + ".path", String.class ).orElse( null );
+            String strMethod = _config.getOptionalValue( MODE_PROPERTY_PREFIX + id + ".outputXslMethod", String.class ).orElse( "xml" );
+            String strVersion = _config.getOptionalValue( MODE_PROPERTY_PREFIX + id + ".outputXslVersion", String.class ).orElse( "1.0" );
+            String strEncoding = _config.getOptionalValue( MODE_PROPERTY_PREFIX + id + ".outputXslEncoding", String.class ).orElse( "UTF-8" );
+            String strIndent = _config.getOptionalValue( MODE_PROPERTY_PREFIX + id + ".outputXslIndent", String.class ).orElse( "yes" );
+            String strOmitXmlDeclaration = _config.getOptionalValue( MODE_PROPERTY_PREFIX + id + ".outputXslOmitXmlDec", String.class ).orElse( "yes" );
+            String strMediaType = _config.getOptionalValue( MODE_PROPERTY_PREFIX + id + ".outputXslMediaType", String.class ).orElse( "text/xml" );
+            String strStandalone = _config.getOptionalValue( MODE_PROPERTY_PREFIX + id + ".outputXslStandalone", String.class ).orElse( null );
+            mode.setId( id );
+            mode.setDescription( strDescription );
+            mode.setPath( strPath );
+            mode.setOutputXslPropertyMethod( strMethod );
+            mode.setOutputXslPropertyVersion( strVersion );
+            mode.setOutputXslPropertyEncoding( strEncoding );
+            mode.setOutputXslPropertyIndent( strIndent );
+            mode.setOutputXslPropertyOmitXmlDeclaration( strOmitXmlDeclaration );
+            mode.setOutputXslPropertyMediaType( strMediaType );
+            mode.setOutputXslPropertyStandalone( strStandalone );
+            _modes.put( id, mode );
+        }
+    }
+
+    @Override
+    public Mode load( int nId )
+    {
+        return _modes.get( nId );
+    }
+
+    @Override
+    public ReferenceList findAllToReferenceList( )
+    {
+        ReferenceList modesList = new ReferenceList( );
+        for ( Mode mode : _modes.values( ) )
+        {
+            modesList.addItem( mode.getId( ), mode.getDescription( ) );
+        }
+        return modesList;
+    }
+
+    @Override
+    public Properties findOuputXslProperties( int nId )
+    {
+        Mode mode = load( nId );
+        Properties ouputProperties = new Properties( );
+
+        String strMethod = mode.getOutputXslPropertyMethod( );
+
+        if ( ( strMethod != null ) && ( !strMethod.trim( ).equals( "" ) ) )
+        {
+            ouputProperties.setProperty( OutputKeys.METHOD, strMethod );
+        }
+
+        String strVersion = mode.getOutputXslPropertyVersion( );
+
+        if ( ( strVersion != null ) && ( !strVersion.trim( ).equals( "" ) ) )
+        {
+            ouputProperties.setProperty( OutputKeys.VERSION, strVersion );
+        }
+
+        String strEncoding = mode.getOutputXslPropertyEncoding( );
+
+        if ( ( strEncoding != null ) && ( !strEncoding.trim( ).equals( "" ) ) )
+        {
+            ouputProperties.setProperty( OutputKeys.ENCODING, strEncoding );
+        }
+
+        String strIndent = mode.getOutputXslPropertyIndent( );
+
+        if ( ( strIndent != null ) && ( !strIndent.trim( ).equals( "" ) ) )
+        {
+            ouputProperties.setProperty( OutputKeys.INDENT, strIndent );
+        }
+
+        String strOmitXmlDeclaration = mode.getOutputXslPropertyOmitXmlDeclaration( );
+
+        if ( ( strOmitXmlDeclaration != null ) && ( !strOmitXmlDeclaration.trim( ).equals( "" ) ) )
+        {
+            ouputProperties.setProperty( OutputKeys.OMIT_XML_DECLARATION, strOmitXmlDeclaration );
+        }
+
+        String strMediaType = mode.getOutputXslPropertyMediaType( );
+
+        if ( ( strMediaType != null ) && ( !strMediaType.trim( ).equals( "" ) ) )
+        {
+            ouputProperties.setProperty( OutputKeys.MEDIA_TYPE, strMediaType );
+        }
+
+        String strStandalone = mode.getOutputXslPropertyStandalone( );
+
+        if ( ( strStandalone != null ) && ( !strStandalone.trim( ).equals( "" ) ) )
+        {
+            ouputProperties.setProperty( OutputKeys.STANDALONE, strStandalone );
+        }
+
+        return ouputProperties;
+    }
+
+}
diff --git a/src/java/fr/paris/lutece/portal/business/style/PageTemplateDAO.java b/src/java/fr/paris/lutece/portal/business/style/PageTemplateDAO.java
index dad4fc325..109ee928e 100644
--- a/src/java/fr/paris/lutece/portal/business/style/PageTemplateDAO.java
+++ b/src/java/fr/paris/lutece/portal/business/style/PageTemplateDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2022, City of Paris
+ * Copyright (c) 2002-2025, City of Paris
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,6 +38,7 @@
 
 import java.sql.Statement;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -89,7 +90,7 @@ public void insert( PageTemplate pageTemplate )
      *            The indentifier of the object PageTemplate
      * @return The Instance of the object PageTemplate
      */
-    public PageTemplate load( int nPageTemplateId )
+    public PageTemplate load( Integer nPageTemplateId )
     {
         PageTemplate pageTemplate = null;
         try ( DAOUtil daoUtil = new DAOUtil( SQL_QUERY_SELECT ) )
@@ -118,7 +119,7 @@ public PageTemplate load( int nPageTemplateId )
      * @param nPageTemplateId
      *            The indentifier of the object PageTemplate
      */
-    public void delete( int nPageTemplateId )
+    public void delete( Integer nPageTemplateId )
     {
         try ( DAOUtil daoUtil = new DAOUtil( SQL_QUERY_DELETE ) )
         {
@@ -153,7 +154,7 @@ public void store( PageTemplate pageTemplate )
      * 
      * @return A list of PageTemplates objects
      */
-    public List<PageTemplate> selectPageTemplatesList( )
+    public Collection<PageTemplate> selectAll( )
     {
         List<PageTemplate> listPageTemplates = new ArrayList<>( );
         try ( DAOUtil daoUtil = new DAOUtil( SQL_QUERY_SELECTALL ) )
diff --git a/src/java/fr/paris/lutece/portal/business/style/PageTemplateHome.java b/src/java/fr/paris/lutece/portal/business/style/PageTemplateHome.java
index c657ce450..2afe3bb81 100644
--- a/src/java/fr/paris/lutece/portal/business/style/PageTemplateHome.java
+++ b/src/java/fr/paris/lutece/portal/business/style/PageTemplateHome.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2022, City of Paris
+ * Copyright (c) 2002-2025, City of Paris
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,15 +35,19 @@
 
 import jakarta.enterprise.inject.spi.CDI;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import fr.paris.lutece.portal.service.style.IStyleService;
+
 /**
  * This class provides instances management methods (create, find, ...) for PageTemplate objects
  */
+@Deprecated( since = "8.0", forRemoval = true )
 public final class PageTemplateHome
 {
     // Static variable pointed at the DAO instance
-    private static IPageTemplateDAO _dao = CDI.current().select( IPageTemplateDAO.class ).get();
+    private static IPageTemplateRepository _repository = CDI.current( ).select( IPageTemplateRepository.class ).get( );
 
     /**
      * Creates a new PageTemplateHome object.
@@ -52,79 +56,21 @@ private PageTemplateHome( )
     {
     }
 
-    /**
-     * Creation of an instance of a page template
-     *
-     * @param pageTemplate
-     *            template An instance of a page template which contains the informations to store
-     * @return The instance of a page template which has been created with its primary key.
-     */
-    public static PageTemplate create( PageTemplate pageTemplate )
-    {
-        _dao.insert( pageTemplate );
-
-        return pageTemplate;
-    }
-
-    /**
-     * Update of the page template which is specified
-     *
-     * @param pageTemplate
-     *            The instance of the page template which contains the data to store
-     * @return The instance of the page template which has been updated
-     */
-    public static PageTemplate update( PageTemplate pageTemplate )
-    {
-        _dao.store( pageTemplate );
-
-        return pageTemplate;
-    }
-
-    /**
-     * Remove the page template whose identifier is specified in parameter
-     *
-     * @param nId
-     *            The identifier of the page template to remove
-     */
-    public static void remove( int nId )
-    {
-        _dao.delete( nId );
-    }
-
-    // /////////////////////////////////////////////////////////////////////////
-    // Finders
-
-    /**
-     * Returns an instance of an page template whose identifier is specified in parameter
-     *
-     * @param nKey
-     *            The page template primary key
-     * @return an instance of a page template
-     */
-    public static PageTemplate findByPrimaryKey( int nKey )
-    {
-        return _dao.load( nKey );
-    }
-
     /**
      * Return the list of all the page templates
      *
+     * @deprecated From the core use {@code @Inject} to obtain the {@link IPageTemplateRepository} instance and access the method
+     *             {@link IPageTemplateRepository#findAll()}. 
+     *             From a plugin use {@code @Inject} to obtain the {@link IStyleService} instance and access the
+     *             method {@link IStyleService#findPageTemplates()}. 
+     *             This method will be removed in future versions.
+     * 
      * @return A collection of page templates objects
      */
+    @Deprecated( since = "8.0", forRemoval = true )
     public static List<PageTemplate> getPageTemplatesList( )
     {
-        return _dao.selectPageTemplatesList( );
+        return new ArrayList<PageTemplate>( _repository.findAll( ) );
     }
 
-    /**
-     * Checks if a page template is used by a page
-     *
-     * @param nPageTemplateId
-     *            The identifier of the page Template
-     * @return true if a page template has been used by a page, false otherwise
-     */
-    public static boolean checkStylePageTemplateIsUsed( int nPageTemplateId )
-    {
-        return _dao.checkPageTemplateIsUsed( nPageTemplateId );
-    }
 }
diff --git a/src/java/fr/paris/lutece/portal/business/style/PageTemplateRepository.java b/src/java/fr/paris/lutece/portal/business/style/PageTemplateRepository.java
new file mode 100644
index 000000000..6cecd84a7
--- /dev/null
+++ b/src/java/fr/paris/lutece/portal/business/style/PageTemplateRepository.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2002-2025, City of Paris
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright notice
+ *     and the following disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above copyright notice
+ *     and the following disclaimer in the documentation and/or other materials
+ *     provided with the distribution.
+ *
+ *  3. Neither the name of 'Mairie de Paris' nor 'Lutece' nor the names of its
+ *     contributors may be used to endorse or promote products derived from
+ *     this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * License 1.0
+ */
+package fr.paris.lutece.portal.business.style;
+
+import fr.paris.lutece.data.dao.IGenericDAO;
+import fr.paris.lutece.data.repository.DAORepository;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
+@ApplicationScoped
+public class PageTemplateRepository extends DAORepository<PageTemplate, Integer> implements IPageTemplateRepository
+{
+
+    @Inject
+    private IPageTemplateDAO _dao;
+
+    @Override
+    protected IGenericDAO<PageTemplate, Integer> getDAO( )
+    {
+        return _dao;
+    }
+
+    @Override
+    public boolean isUsedByPage( int nId )
+    {
+        return _dao.checkPageTemplateIsUsed( nId );
+    }
+
+}
diff --git a/src/java/fr/paris/lutece/portal/business/style/StyleDAO.java b/src/java/fr/paris/lutece/portal/business/style/StyleDAO.java
index cb44e1ccc..5052787f8 100644
--- a/src/java/fr/paris/lutece/portal/business/style/StyleDAO.java
+++ b/src/java/fr/paris/lutece/portal/business/style/StyleDAO.java
@@ -94,7 +94,7 @@ public void insert( Style style )
      *            The identifier of the Style
      * @return an instance of the Style which has been created
      */
-    public Style load( int nStyleId )
+    public Style load( Integer nStyleId )
     {
         Style style = null;
         try ( DAOUtil daoUtil = new DAOUtil( SQL_QUERY_SELECT ) )
@@ -125,7 +125,7 @@ public Style load( int nStyleId )
      * @param nStyleId
      *            the identifier of the style to delete
      */
-    public void delete( int nStyleId )
+    public void delete( Integer nStyleId )
     {
         try ( DAOUtil daoUtil = new DAOUtil( SQL_QUERY_DELETE ) )
         {
@@ -159,7 +159,7 @@ public void store( Style style )
      * 
      * @return The styles list in form of a Collection object
      */
-    public Collection<Style> selectStylesList( )
+    public Collection<Style> selectAll( )
     {
         Collection<Style> styleList = new ArrayList<>( );
         try ( DAOUtil daoUtil = new DAOUtil( SQL_QUERY_SELECTALL ) )
@@ -264,4 +264,5 @@ public boolean checkStylePortalComponent( int nPortalComponentId )
 
         return check;
     }
+
 }
diff --git a/src/java/fr/paris/lutece/portal/business/style/StyleHome.java b/src/java/fr/paris/lutece/portal/business/style/StyleHome.java
index c61b985d1..a7dd223ec 100644
--- a/src/java/fr/paris/lutece/portal/business/style/StyleHome.java
+++ b/src/java/fr/paris/lutece/portal/business/style/StyleHome.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2022, City of Paris
+ * Copyright (c) 2002-2025, City of Paris
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,7 +34,7 @@
 package fr.paris.lutece.portal.business.style;
 
 import fr.paris.lutece.portal.business.stylesheet.StyleSheet;
-import fr.paris.lutece.util.ReferenceList;
+import fr.paris.lutece.portal.service.style.IStyleService;
 import jakarta.enterprise.inject.spi.CDI;
 
 import java.util.Collection;
@@ -42,10 +42,10 @@
 /**
  * This class provides instances management methods (create, find, ...) for Style objects
  */
+@Deprecated( since = "8.0", forRemoval = true )
 public final class StyleHome
 {
-    // Static variable pointed at the DAO instance
-    private static IStyleDAO _dao = CDI.current( ).select( IStyleDAO.class ).get( );
+    private static IStyleRepository _repository = CDI.current( ).select( IStyleRepository.class ).get( );
 
     /**
      * Creates a new StyleHome object.
@@ -54,65 +54,34 @@ private StyleHome( )
     {
     }
 
-    /**
-     * Creation of a Style record in the database
-     *
-     * @param style
-     *            An instance of the style which contains the informations to store
-     * @return The instance of the style which has been created.
-     */
-    public static Style create( Style style )
-    {
-        _dao.insert( style );
-
-        return style;
-    }
-
-    /**
-     * Updates the record in the database which corresponds to the Style instance specified in parameter.
-     *
-     * @param style
-     *            the instance of the style to update
-     */
-    public static void update( Style style )
-    {
-        _dao.store( style );
-    }
-
-    /**
-     * Deletes the record in the database which corresponds to the Style instance specified in parameter.
-     *
-     * @param nStyleId
-     *            The identifier of the style
-     */
-    public static void remove( int nStyleId )
-    {
-        _dao.delete( nStyleId );
-    }
-
-    // /////////////////////////////////////////////////////////////////////////
-    // Finders
-
     /**
      * Returns an instance of a style whose identifier is specified in parameter
      *
      * @param nKey
      *            The primary key of the style to find in the database
+     * @deprecated From the core use {@code @Inject} to obtain the {@link IStyleRepository} instance and access the method {@link IStyleRepository#load(Integer)}. 
+     *             From a plugin use {@code @Inject} to obtain the {@link IStyleService} instance and access the method {@link IStyleService#findStyleById(int)}. 
+     *             This method will be removed in future versions.
      * @return The Style object which corresponds to the key
      */
+    @Deprecated( since = "8.0", forRemoval = true )
     public static Style findByPrimaryKey( int nKey )
     {
-        return _dao.load( nKey );
+        return _repository.load( nKey ).orElse( null );
     }
 
     /**
      * Returns the collection of the Style objects stored in the database
-     *
+     * 
+     * @deprecated From the core use {@code @Inject} to obtain the {@link IStyleRepository} instance and access the method {@link IStyleRepository#findAll()}.
+     *             From a plugin use {@code @Inject} to obtain the {@link IStyleService} instance and access the method {@link IStyleService#findStyleById(int)}. 
+     *             This method will be removed in future versions.
      * @return A collection of styles
      */
+    @Deprecated( since = "8.0", forRemoval = true )
     public static Collection<Style> getStylesList( )
     {
-        return _dao.selectStylesList( );
+        return _repository.findAll( );
     }
 
     /**
@@ -120,32 +89,14 @@ public static Collection<Style> getStylesList( )
      *
      * @param nStyleId
      *            identifier of the style
+     * @deprecated From the core use {@code @Inject} to obtain the {@link IStyleRepository} instance and access the method {@link IStyleRepository#findStyleSheetsByStyle(int)}. 
+     *             From a plugin use {@code @Inject} to obtain the {@link IStyleService} instance and access the method {@link IStyleService#findStyleSheetsByStyle(int)}. 
+     *             This method will be removed in future versions.
      * @return A collection of styles
      */
+    @Deprecated( since = "8.0", forRemoval = true )
     public static Collection<StyleSheet> getStyleSheetList( int nStyleId )
     {
-        return _dao.selectStyleSheetList( nStyleId );
-    }
-
-    /**
-     * Returns a reference list which contains all the Portal Components
-     *
-     * @return a reference list
-     */
-    public static ReferenceList getPortalComponentList( )
-    {
-        return _dao.selectPortalComponentList( );
-    }
-
-    /**
-     * Checks if a style has been created in the database with the given portal componenet
-     *
-     * @param nPortalComponentId
-     *            The identifier of the portal component
-     * @return true if a style has been created for this portal component, false otherwise
-     */
-    public static boolean checkStylePortalComponent( int nPortalComponentId )
-    {
-        return _dao.checkStylePortalComponent( nPortalComponentId );
+        return _repository.findStyleSheetsByStyle( nStyleId );
     }
 }
diff --git a/src/java/fr/paris/lutece/portal/business/style/StyleRepository.java b/src/java/fr/paris/lutece/portal/business/style/StyleRepository.java
new file mode 100644
index 000000000..6f72b97f4
--- /dev/null
+++ b/src/java/fr/paris/lutece/portal/business/style/StyleRepository.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2002-2025, City of Paris
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright notice
+ *     and the following disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above copyright notice
+ *     and the following disclaimer in the documentation and/or other materials
+ *     provided with the distribution.
+ *
+ *  3. Neither the name of 'Mairie de Paris' nor 'Lutece' nor the names of its
+ *     contributors may be used to endorse or promote products derived from
+ *     this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * License 1.0
+ */
+package fr.paris.lutece.portal.business.style;
+
+import java.util.Collection;
+
+import fr.paris.lutece.data.dao.IGenericDAO;
+import fr.paris.lutece.data.repository.DAORepository;
+import fr.paris.lutece.portal.business.stylesheet.StyleSheet;
+import fr.paris.lutece.util.ReferenceList;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
+@ApplicationScoped
+public class StyleRepository extends DAORepository<Style, Integer> implements IStyleRepository
+{
+
+    @Inject
+    private IStyleDAO _dao;
+
+    @Override
+    protected IGenericDAO<Style, Integer> getDAO( )
+    {
+        return _dao;
+    }
+
+    @Override
+    public ReferenceList findPortalComponents( )
+    {
+        return _dao.selectPortalComponentList( );
+    }
+
+    @Override
+    public boolean existsPortalComponentForStyle( int nPortalComponentId )
+    {
+        return _dao.checkStylePortalComponent( nPortalComponentId );
+    }
+
+    @Override
+    public Collection<StyleSheet> findStyleSheetsByStyle( int nStyleId )
+    {
+        return _dao.selectStyleSheetList( nStyleId );
+    }
+
+}
diff --git a/src/java/fr/paris/lutece/portal/business/stylesheet/IStyleSheetDAO.java b/src/java/fr/paris/lutece/portal/business/stylesheet/IStyleSheetDAO.java
index b05e12a4e..508faa84a 100644
--- a/src/java/fr/paris/lutece/portal/business/stylesheet/IStyleSheetDAO.java
+++ b/src/java/fr/paris/lutece/portal/business/stylesheet/IStyleSheetDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2022, City of Paris
+ * Copyright (c) 2002-2025, City of Paris
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,11 +35,13 @@
 
 import java.util.Collection;
 
+import fr.paris.lutece.data.dao.IGenericDAO;
+
 /**
  *
  * @author LEVY
  */
-public interface IStyleSheetDAO
+public interface IStyleSheetDAO extends IGenericDAO<StyleSheet, Integer>
 {
     /**
      * Delete the StyleSheet from the database whose identifier is specified in parameter
@@ -47,7 +49,7 @@ public interface IStyleSheetDAO
      * @param nIdStylesheet
      *            the identifier of the StyleSheet to delete
      */
-    void delete( int nIdStylesheet );
+    void delete( Integer nIdStylesheet );
 
     /**
      * Insert a new record in the table.
@@ -64,16 +66,7 @@ public interface IStyleSheetDAO
      *            the identifier of the Stylesheet to load
      * @return stylesheet
      */
-    StyleSheet load( int nIdStylesheet );
-
-    /**
-     * Returns the identifier of the mode of the stylesheet whose identifier is specified in parameter
-     *
-     * @param nIdStylesheet
-     *            the identifier of the stylesheet
-     * @return the identifier of the mode
-     */
-    int selectModeId( int nIdStylesheet );
+    StyleSheet load( Integer nIdStylesheet );
 
     /**
      * Load the list of stylesheet
diff --git a/src/java/fr/paris/lutece/portal/business/stylesheet/IStyleSheetRepository.java b/src/java/fr/paris/lutece/portal/business/stylesheet/IStyleSheetRepository.java
new file mode 100644
index 000000000..6bc06b0b7
--- /dev/null
+++ b/src/java/fr/paris/lutece/portal/business/stylesheet/IStyleSheetRepository.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2002-2025, City of Paris
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright notice
+ *     and the following disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above copyright notice
+ *     and the following disclaimer in the documentation and/or other materials
+ *     provided with the distribution.
+ *
+ *  3. Neither the name of 'Mairie de Paris' nor 'Lutece' nor the names of its
+ *     contributors may be used to endorse or promote products derived from
+ *     this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * License 1.0
+ */
+package fr.paris.lutece.portal.business.stylesheet;
+
+import java.util.Collection;
+
+import fr.paris.lutece.data.repository.IRepository;
+
+public interface IStyleSheetRepository extends IRepository<StyleSheet, Integer>
+{
+
+    Collection<StyleSheet> findByMode( int nModeId );
+
+    int countPerStyleAndMode( int nStyleId, int nModeId );
+    
+}
diff --git a/src/java/fr/paris/lutece/portal/business/stylesheet/StyleSheetDAO.java b/src/java/fr/paris/lutece/portal/business/stylesheet/StyleSheetDAO.java
index cb37721b7..e213785c5 100644
--- a/src/java/fr/paris/lutece/portal/business/stylesheet/StyleSheetDAO.java
+++ b/src/java/fr/paris/lutece/portal/business/stylesheet/StyleSheetDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2022, City of Paris
+ * Copyright (c) 2002-2025, City of Paris
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,8 +53,6 @@ public final class StyleSheetDAO implements IStyleSheetDAO
     private static final String SQL_QUERY_INSERT = " INSERT INTO core_stylesheet ( description , file_name, source ) " + " VALUES ( ? ,?, ? )";
     private static final String SQL_QUERY_DELETE = " DELETE FROM core_stylesheet WHERE id_stylesheet = ? ";
     private static final String SQL_QUERY_UPDATE = " UPDATE core_stylesheet SET id_stylesheet = ?, description = ?, file_name = ?, source = ? WHERE id_stylesheet = ?  ";
-    private static final String SQL_QUERY_SELECT_MODEID = " SELECT a.id_mode FROM core_mode a , core_style_mode_stylesheet b  "
-            + " WHERE a.id_mode = b.id_mode AND b.id_stylesheet = ?";
     private static final String SQL_QUERY_COUNT_STYLESHEET = " SELECT count(*) FROM core_style_mode_stylesheet WHERE id_style = ? AND id_mode = ? ";
     private static final String SQL_QUERY_INSERT_STYLEMODESTYLESHEET = " INSERT INTO core_style_mode_stylesheet ( id_style , id_mode , id_stylesheet ) "
             + " VALUES ( ?, ? ,? )";
@@ -100,7 +98,7 @@ public void insert( StyleSheet stylesheet )
      *            the identifier of the Stylesheet to load
      * @return stylesheet
      */
-    public StyleSheet load( int nIdStylesheet )
+    public StyleSheet load( Integer nIdStylesheet )
     {
         StyleSheet stylesheet = null;
         try ( DAOUtil daoUtil = new DAOUtil( SQL_QUERY_SELECT ) )
@@ -130,7 +128,7 @@ public StyleSheet load( int nIdStylesheet )
      * @param nIdStylesheet
      *            the identifier of the StyleSheet to delete
      */
-    public void delete( int nIdStylesheet )
+    public void delete( Integer nIdStylesheet )
     {
         try ( DAOUtil daoUtil = new DAOUtil( SQL_QUERY_DELETE ) )
         {
@@ -299,32 +297,9 @@ public int selectStyleSheetNbPerStyleMode( int nStyleId, int nModeId )
         return nCount;
     }
 
-    /**
-     * Returns the identifier of the mode of the stylesheet whose identifier is specified in parameter
-     * 
-     * @param nIdStylesheet
-     *            the identifier of the stylesheet
-     * @return the identifier of the mode
-     */
-    public int selectModeId( int nIdStylesheet )
+    public Collection<StyleSheet> selectAll()
     {
-        int nModeId;
-        try ( DAOUtil daoUtil = new DAOUtil( SQL_QUERY_SELECT_MODEID ) )
-        {
-
-            daoUtil.setInt( 1, nIdStylesheet );
-            daoUtil.executeQuery( );
-
-            if ( !daoUtil.next( ) )
-            {
-                daoUtil.free( );
-                throw new AppException( DAOUtil.MSG_EXCEPTION_SELECT_ERROR + nIdStylesheet );
-            }
-
-            nModeId = ( daoUtil.getInt( 1 ) );
-
-        }
-
-        return nModeId;
+        return selectStyleSheetList( -1 );
     }
+
 }
diff --git a/src/java/fr/paris/lutece/portal/business/stylesheet/StyleSheetHome.java b/src/java/fr/paris/lutece/portal/business/stylesheet/StyleSheetHome.java
index 297a11f01..a7bd9015a 100644
--- a/src/java/fr/paris/lutece/portal/business/stylesheet/StyleSheetHome.java
+++ b/src/java/fr/paris/lutece/portal/business/stylesheet/StyleSheetHome.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2022, City of Paris
+ * Copyright (c) 2002-2025, City of Paris
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,18 +33,17 @@
  */
 package fr.paris.lutece.portal.business.stylesheet;
 
-import fr.paris.lutece.portal.service.html.XmlTransformerService;
-import jakarta.enterprise.inject.spi.CDI;
-
 import java.util.Collection;
 
+import jakarta.enterprise.inject.spi.CDI;
+
 /**
  * This class provides instances management methods (create, find, ...) for Stylesheet objects
  */
+@Deprecated( since = "8.0", forRemoval = true )
 public final class StyleSheetHome
 {
-    // Static variable pointed to the DAO instance
-    private static IStyleSheetDAO _dao = CDI.current( ).select( IStyleSheetDAO.class ).get( );
+    private static IStyleSheetRepository _repository = CDI.current( ).select( IStyleSheetRepository.class ).get( );
 
     /**
      * Creates a new StyleSheetHome object.
@@ -53,71 +52,19 @@ private StyleSheetHome( )
     {
     }
 
-    /**
-     * Creation of an instance of a Stylesheet file in the database
-     *
-     * @param stylesheet
-     *            An instance of a stylesheet which contains the informations to store
-     * @return The instance of the stylesheet which has been created.
-     */
-    public static StyleSheet create( StyleSheet stylesheet )
-    {
-        _dao.insert( stylesheet );
-
-        return stylesheet;
-    }
-
-    /**
-     * Deletes the StylesSheet whose identifier is specified in parameter
-     *
-     * @param nId
-     *            the identifier of the stylesheet to delete
-     */
-    public static void remove( int nId )
-    {
-        _dao.delete( nId );
-        XmlTransformerService.clearXslCache( );
-    }
-
-    /**
-     * Update the StylesSheet whose identifier is specified in parameter
-     *
-     * @param stylesheet
-     *            the stylesheet to update
-     */
-    public static void update( StyleSheet stylesheet )
-    {
-        _dao.store( stylesheet );
-        XmlTransformerService.clearXslCache( );
-    }
-
-    // /////////////////////////////////////////////////////////////////////////
-    // Finders
-
     /**
      * Returns an instance of a stylesheet file whose identifier is specified in parameter
      *
      * @param nKey
      *            the stylesheet primary key
+     * @deprecated Use {@code @Inject} to obtain the {@link IStyleSheetRepository} instance and access the method {@link IStyleSheetRepository#load(Integer)}.
+     *             This method will be removed in future versions.
      * @return the instance of the styleSheet whose identifier is the nKey
      */
+    @Deprecated( since = "8.0", forRemoval = true )
     public static StyleSheet findByPrimaryKey( int nKey )
     {
-        return _dao.load( nKey );
-    }
-
-    /**
-     * Returns the number of stylesheets associated to the style and the mode specified in parameter
-     *
-     * @param nStyleId
-     *            the style id
-     * @param nModeId
-     *            the mode id
-     * @return the number of stylesheet associated
-     */
-    public static int getStyleSheetNbPerStyleMode( int nStyleId, int nModeId )
-    {
-        return _dao.selectStyleSheetNbPerStyleMode( nStyleId, nModeId );
+        return _repository.load( nKey ).orElse( null );
     }
 
     /**
@@ -125,10 +72,13 @@ public static int getStyleSheetNbPerStyleMode( int nStyleId, int nModeId )
      *
      * @param nModeId
      *            The mode identifier
+     * @deprecated Use {@code @Inject} to obtain the {@link IStyleSheetRepository} instance and access the method {@link IStyleSheetRepository#findByMode(int)}.
+     *             This method will be removed in future versions.
      * @return A collection of StyleSheet object
      */
+    @Deprecated( since = "8.0", forRemoval = true )
     public static Collection<StyleSheet> getStyleSheetList( int nModeId )
     {
-        return _dao.selectStyleSheetList( nModeId );
+        return _repository.findByMode( nModeId );
     }
 }
diff --git a/src/java/fr/paris/lutece/portal/business/stylesheet/StyleSheetRepository.java b/src/java/fr/paris/lutece/portal/business/stylesheet/StyleSheetRepository.java
new file mode 100644
index 000000000..d8e1173c6
--- /dev/null
+++ b/src/java/fr/paris/lutece/portal/business/stylesheet/StyleSheetRepository.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2002-2025, City of Paris
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright notice
+ *     and the following disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above copyright notice
+ *     and the following disclaimer in the documentation and/or other materials
+ *     provided with the distribution.
+ *
+ *  3. Neither the name of 'Mairie de Paris' nor 'Lutece' nor the names of its
+ *     contributors may be used to endorse or promote products derived from
+ *     this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * License 1.0
+ */
+package fr.paris.lutece.portal.business.stylesheet;
+
+import java.util.Collection;
+
+import fr.paris.lutece.data.dao.IGenericDAO;
+import fr.paris.lutece.data.repository.DAORepository;
+import fr.paris.lutece.portal.service.html.XmlTransformerService;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
+@ApplicationScoped
+public class StyleSheetRepository extends DAORepository<StyleSheet, Integer> implements IStyleSheetRepository
+{
+
+    @Inject
+    private IStyleSheetDAO _dao;
+
+    @Override
+    protected IGenericDAO<StyleSheet, Integer> getDAO( )
+    {
+        return _dao;
+    }
+
+    @Override
+    public StyleSheet update( StyleSheet styleSheet )
+    {
+        super.update( styleSheet );
+        XmlTransformerService.clearXslCache( );
+        return styleSheet;
+    }
+
+    @Override
+    public void remove( Integer paramID )
+    {
+        super.remove( paramID );
+        XmlTransformerService.clearXslCache( );
+    }
+
+    @Override
+    public Collection<StyleSheet> findByMode( int nModeId )
+    {
+        return _dao.selectStyleSheetList( nModeId );
+    }
+
+    @Override
+    public int countPerStyleAndMode( int nStyleId, int nModeId )
+    {
+        return _dao.selectStyleSheetNbPerStyleMode( nStyleId, nModeId );
+    }
+
+}
diff --git a/src/java/fr/paris/lutece/portal/service/page/PageService.java b/src/java/fr/paris/lutece/portal/service/page/PageService.java
index fc92276c8..aeebba579 100644
--- a/src/java/fr/paris/lutece/portal/service/page/PageService.java
+++ b/src/java/fr/paris/lutece/portal/service/page/PageService.java
@@ -64,7 +64,7 @@
 import fr.paris.lutece.portal.business.portlet.Portlet;
 import fr.paris.lutece.portal.business.portlet.PortletRoleRemovalListener;
 import fr.paris.lutece.portal.business.portlet.PortletType;
-import fr.paris.lutece.portal.business.style.ModeHome;
+import fr.paris.lutece.portal.business.style.IModeRepository;
 import fr.paris.lutece.portal.business.user.AdminUser;
 import fr.paris.lutece.portal.service.admin.AdminUserService;
 import fr.paris.lutece.portal.service.cache.CacheConfigUtil;
@@ -183,7 +183,8 @@ public class PageService implements IPageService, ImageResourceProvider
     private PageCacheService _cachePages;
     @Inject
     private PortletCacheService _cachePortlets;
-
+    @Inject
+    private IModeRepository _modeRepository;
 
     /**
      * Initializes the service
@@ -678,7 +679,7 @@ private String getPortletContent( HttpServletRequest request, Portlet portlet, M
                 }
             }
 
-            Properties outputProperties = ModeHome.getOuputXslProperties( nMode );
+            Properties outputProperties = _modeRepository.findOuputXslProperties( nMode );
             String strXslUniqueId = XSL_UNIQUE_PREFIX + String.valueOf( portlet.getStyleId( ) );
             XmlTransformerService xmlTransformerService = new XmlTransformerService( );
             String strPortletXmlContent = portlet.getXml( request );
diff --git a/src/java/fr/paris/lutece/portal/service/portal/PortalMenuService.java b/src/java/fr/paris/lutece/portal/service/portal/PortalMenuService.java
index d59cdae48..a4051b2de 100644
--- a/src/java/fr/paris/lutece/portal/service/portal/PortalMenuService.java
+++ b/src/java/fr/paris/lutece/portal/service/portal/PortalMenuService.java
@@ -37,7 +37,7 @@
 import fr.paris.lutece.portal.business.page.Page;
 import fr.paris.lutece.portal.business.page.PageHome;
 import fr.paris.lutece.portal.business.portalcomponent.PortalComponentHome;
-import fr.paris.lutece.portal.business.style.ModeHome;
+import fr.paris.lutece.portal.business.style.IModeRepository;
 import fr.paris.lutece.portal.business.stylesheet.StyleSheet;
 import fr.paris.lutece.portal.service.cache.Lutece107Cache;
 import fr.paris.lutece.portal.service.cache.LuteceCache;
@@ -80,6 +80,8 @@ public class PortalMenuService
     @Inject
 	@LuteceCache(cacheName = SERVICE_NAME, keyType = String.class, valueType = String.class, enable = true)
 	private Lutece107Cache<String, String> _cachePortalMenu;
+    @Inject
+    private IModeRepository _modeRepository;
 
     PortalMenuService( )
     {
@@ -187,7 +189,7 @@ private String buildMenuContent( int nCurrentPageId, int nMode, int nPart, HttpS
         // Added in v1.3
         StyleSheet xslSource = getMenuXslSource( nMode, nPart );
 
-        Properties outputProperties = ModeHome.getOuputXslProperties( nMode );
+        Properties outputProperties = _modeRepository.findOuputXslProperties( nMode );
 
         // Added in v1.3
         // Add a path param for choose url to use in admin or normal mode
diff --git a/src/java/fr/paris/lutece/portal/service/portal/PortalService.java b/src/java/fr/paris/lutece/portal/service/portal/PortalService.java
index de10095cf..08297e387 100644
--- a/src/java/fr/paris/lutece/portal/service/portal/PortalService.java
+++ b/src/java/fr/paris/lutece/portal/service/portal/PortalService.java
@@ -52,7 +52,7 @@
 import fr.paris.lutece.portal.business.portalcomponent.PortalComponentHome;
 import fr.paris.lutece.portal.business.portlet.Portlet;
 import fr.paris.lutece.portal.business.portlet.PortletHome;
-import fr.paris.lutece.portal.business.style.ModeHome;
+import fr.paris.lutece.portal.business.style.IModeRepository;
 import fr.paris.lutece.portal.business.stylesheet.StyleSheet;
 import fr.paris.lutece.portal.service.cache.PathCacheService;
 import fr.paris.lutece.portal.service.content.ContentService;
@@ -130,6 +130,8 @@ public final class PortalService
     private static Map<String, ContentService> _mapContentServicesRegistry = new HashMap<>( );
     private static IPageService _pageService = CDI.current().select(IPageService.class).get();  
     private static PathCacheService _pathCacheService = CDI.current().select( PathCacheService.class ).get( );
+    private static IModeRepository _modeRepository = CDI.current( ).select( IModeRepository.class ).get( );
+
     /**
      * Private Constructor
      */
@@ -403,7 +405,7 @@ public static String getPagePathContent( int nPageId, int nMode, HttpServletRequ
 
         String strXml = getXmlPagesList( getPagePath( nPageId ) );
 
-        Properties outputProperties = ModeHome.getOuputXslProperties( nMode );
+        Properties outputProperties = _modeRepository.findOuputXslProperties( nMode );
 
         // Added in v1.3
         // Add a path param for choose url to use in admin or normal mode
@@ -488,7 +490,7 @@ public static String getXPagePathContent( String strXPageName, int nMode, HttpSe
             strXml = getXmlPagesList( getXPagePath( strXPageName ) );
         }
 
-        Properties outputProperties = ModeHome.getOuputXslProperties( nMode );
+        Properties outputProperties = _modeRepository.findOuputXslProperties( nMode );
 
         // Added in v1.3
         // Add a path param for choose url to use in admin or normal mode
@@ -709,7 +711,7 @@ public static String getXPagePathContent( String strXPageName, int nMode, String
 
         String strXml = getXmlPagesListExtended( strTitlesUrls );
 
-        Properties outputProperties = ModeHome.getOuputXslProperties( nMode );
+        Properties outputProperties = _modeRepository.findOuputXslProperties( nMode );
 
         // Added in v1.3
         // Add a path param for choose url to use in admin or normal mode
diff --git a/src/java/fr/paris/lutece/portal/service/style/IStyleService.java b/src/java/fr/paris/lutece/portal/service/style/IStyleService.java
new file mode 100644
index 000000000..e121406ba
--- /dev/null
+++ b/src/java/fr/paris/lutece/portal/service/style/IStyleService.java
@@ -0,0 +1,33 @@
+package fr.paris.lutece.portal.service.style;
+
+import java.util.Collection;
+import java.util.Optional;
+import java.util.Properties;
+
+import fr.paris.lutece.portal.business.style.Mode;
+import fr.paris.lutece.portal.business.style.PageTemplate;
+import fr.paris.lutece.portal.business.style.Style;
+import fr.paris.lutece.portal.business.stylesheet.StyleSheet;
+import fr.paris.lutece.util.ReferenceList;
+
+public interface IStyleService
+{
+
+    Optional<Style> findStyleById( int nId );
+
+    Collection<Style> findStyles( );
+
+    Optional<StyleSheet> findStyleSheetById( int nId );
+
+    Collection<StyleSheet> findStyleSheetsByMode( int nModeId );
+
+    Collection<StyleSheet> findStyleSheetsByStyle( int nStyleId );
+
+    Collection<PageTemplate> findPageTemplates( );
+
+    Optional<Mode> findModeById( int nId );
+
+    ReferenceList findModesToReferenceList( );
+
+    Properties findModeXlsOutputProperties( int nModeId );
+}
diff --git a/src/java/fr/paris/lutece/portal/service/style/StyleService.java b/src/java/fr/paris/lutece/portal/service/style/StyleService.java
new file mode 100644
index 000000000..076c2aab6
--- /dev/null
+++ b/src/java/fr/paris/lutece/portal/service/style/StyleService.java
@@ -0,0 +1,86 @@
+package fr.paris.lutece.portal.service.style;
+
+import java.util.Collection;
+import java.util.Optional;
+import java.util.Properties;
+
+import fr.paris.lutece.portal.business.style.IModeRepository;
+import fr.paris.lutece.portal.business.style.IPageTemplateRepository;
+import fr.paris.lutece.portal.business.style.IStyleRepository;
+import fr.paris.lutece.portal.business.style.Mode;
+import fr.paris.lutece.portal.business.style.PageTemplate;
+import fr.paris.lutece.portal.business.style.Style;
+import fr.paris.lutece.portal.business.stylesheet.IStyleSheetRepository;
+import fr.paris.lutece.portal.business.stylesheet.StyleSheet;
+import fr.paris.lutece.util.ReferenceList;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
+@ApplicationScoped
+public class StyleService implements IStyleService
+{
+
+    @Inject
+    private IStyleRepository _styleRepository;
+    @Inject
+    private IStyleSheetRepository _styleSheetRepository;
+    @Inject
+    private IPageTemplateRepository _pageTemplateRepository;
+    @Inject
+    private IModeRepository _modeRepository;
+
+    @Override
+    public Optional<Style> findStyleById( int nId )
+    {
+        return _styleRepository.load( nId );
+    }
+
+    @Override
+    public Collection<Style> findStyles( )
+    {
+        return _styleRepository.findAll( );
+    }
+
+    @Override
+    public Optional<StyleSheet> findStyleSheetById( int nId )
+    {
+        return _styleSheetRepository.load( nId );
+    }
+
+    @Override
+    public Collection<StyleSheet> findStyleSheetsByMode( int nModeId )
+    {
+        return _styleSheetRepository.findByMode( nModeId );
+    }
+
+    @Override
+    public Collection<StyleSheet> findStyleSheetsByStyle( int nStyleId )
+    {
+        return _styleRepository.findStyleSheetsByStyle( nStyleId );
+    }
+
+    @Override
+    public Collection<PageTemplate> findPageTemplates( )
+    {
+        return _pageTemplateRepository.findAll( );
+    }
+
+    @Override
+    public Optional<Mode> findModeById( int nId )
+    {
+        return Optional.ofNullable( _modeRepository.load( nId ) );
+    }
+
+    @Override
+    public ReferenceList findModesToReferenceList( )
+    {
+        return _modeRepository.findAllToReferenceList( );
+    }
+
+    @Override
+    public Properties findModeXlsOutputProperties( int nModeId )
+    {
+        return _modeRepository.findOuputXslProperties( nModeId );
+    }
+
+}
diff --git a/src/java/fr/paris/lutece/portal/web/admin/AdminMapJspBean.java b/src/java/fr/paris/lutece/portal/web/admin/AdminMapJspBean.java
index 45b1c07ba..fc9b02a8c 100644
--- a/src/java/fr/paris/lutece/portal/web/admin/AdminMapJspBean.java
+++ b/src/java/fr/paris/lutece/portal/web/admin/AdminMapJspBean.java
@@ -38,7 +38,7 @@
 import fr.paris.lutece.portal.business.page.Page;
 import fr.paris.lutece.portal.business.page.PageHome;
 import fr.paris.lutece.portal.business.portalcomponent.PortalComponentHome;
-import fr.paris.lutece.portal.business.style.ModeHome;
+import fr.paris.lutece.portal.business.style.IModeRepository;
 import fr.paris.lutece.portal.business.stylesheet.StyleSheet;
 import fr.paris.lutece.portal.service.admin.AdminUserService;
 import fr.paris.lutece.portal.service.html.XmlTransformerService;
@@ -55,6 +55,7 @@
 import java.util.Properties;
 
 import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import jakarta.servlet.http.HttpServletRequest;
 
@@ -89,6 +90,9 @@ public class AdminMapJspBean extends AdminFeaturesPageJspBean
     private static final int PORTAL_COMPONENT_SITE_MAP_ID = 8;
     private static final int MODE_ADMIN = 1;
 
+    @Inject
+    private IModeRepository _modeRepository;
+
     /**
      * Build or get in the cache the page which contains the site map depending on the mode
      *
@@ -114,7 +118,7 @@ public String getMap( HttpServletRequest request )
         Map<String, String> mapParamRequest = new HashMap<>( );
         mapParamRequest.put( PARAMETER_SITE_PATH, AppPropertiesService.getProperty( PROPERTY_ADMIN_PATH ) );
 
-        Properties outputProperties = ModeHome.getOuputXslProperties( MODE_ADMIN );
+        Properties outputProperties = _modeRepository.findOuputXslProperties( MODE_ADMIN );
 
         Map<String, Object> model = new HashMap<>( );
         XmlTransformerService xmlTransformerService = new XmlTransformerService( );
diff --git a/src/java/fr/paris/lutece/portal/web/admin/AdminPageJspBean.java b/src/java/fr/paris/lutece/portal/web/admin/AdminPageJspBean.java
index 9d539ea4e..88650a100 100644
--- a/src/java/fr/paris/lutece/portal/web/admin/AdminPageJspBean.java
+++ b/src/java/fr/paris/lutece/portal/web/admin/AdminPageJspBean.java
@@ -41,6 +41,7 @@
 
 import jakarta.enterprise.context.SessionScoped;
 import jakarta.enterprise.inject.spi.CDI;
+import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import jakarta.servlet.http.HttpServletRequest;
 
@@ -53,8 +54,8 @@
 import fr.paris.lutece.portal.business.portlet.PortletType;
 import fr.paris.lutece.portal.business.portlet.PortletTypeHome;
 import fr.paris.lutece.portal.business.role.RoleHome;
+import fr.paris.lutece.portal.business.style.IPageTemplateRepository;
 import fr.paris.lutece.portal.business.style.PageTemplate;
-import fr.paris.lutece.portal.business.style.PageTemplateHome;
 import fr.paris.lutece.portal.business.user.AdminUser;
 import fr.paris.lutece.portal.service.admin.AccessDeniedException;
 import fr.paris.lutece.portal.service.content.ContentPostProcessorService;
@@ -163,7 +164,8 @@ public class AdminPageJspBean extends AdminFeaturesPageJspBean
     // Constants
     private static final int MAX_TITLE_LENGTH = 50;
 
-   
+    @Inject
+    private IPageTemplateRepository _pageTemplateRepository;
 
     /**
      * Displays the page which contains the management forms of a skin page whose identifier is specified in parameter
@@ -610,7 +612,7 @@ private String getAdminPageBlockProperty( Page page, int nParamBlock, Map<String
         StringBuilder strPageTemplatesRow = new StringBuilder( );
 
         // Scan of the list
-        for ( PageTemplate pageTemplate : PageTemplateHome.getPageTemplatesList( ) )
+        for ( PageTemplate pageTemplate : _pageTemplateRepository.findAll( ) )
         {
             strPageTemplatesRow.append( getTemplatesPageList( pageTemplate.getId( ), page.getPageTemplateId( ), Integer.toString( nIndexRow ) ) );
             nIndexRow++;
@@ -820,7 +822,7 @@ private String getTemplatesPageList( int nTemplatePageId, int nPageTemplatePageI
     {
         Map<String, Object> model = new HashMap<>( );
 
-        PageTemplate pageTemplate = PageTemplateHome.findByPrimaryKey( nTemplatePageId );
+        PageTemplate pageTemplate = _pageTemplateRepository.load( nTemplatePageId ).get( );
         model.put( MARK_PAGE_TEMPLATE, pageTemplate );
         model.put( MARK_INDEX_ROW, nIndexRow );
 
diff --git a/src/java/fr/paris/lutece/portal/web/includes/TreeMenuInclude.java b/src/java/fr/paris/lutece/portal/web/includes/TreeMenuInclude.java
index aed59e714..d305f7f37 100644
--- a/src/java/fr/paris/lutece/portal/web/includes/TreeMenuInclude.java
+++ b/src/java/fr/paris/lutece/portal/web/includes/TreeMenuInclude.java
@@ -37,7 +37,7 @@
 import fr.paris.lutece.portal.business.page.Page;
 import fr.paris.lutece.portal.business.page.PageHome;
 import fr.paris.lutece.portal.business.portalcomponent.PortalComponentHome;
-import fr.paris.lutece.portal.business.style.ModeHome;
+import fr.paris.lutece.portal.business.style.IModeRepository;
 import fr.paris.lutece.portal.business.stylesheet.StyleSheet;
 import fr.paris.lutece.portal.service.content.PageData;
 import fr.paris.lutece.portal.service.html.XmlTransformerService;
@@ -55,6 +55,7 @@
 import java.util.Map;
 import java.util.Properties;
 
+import jakarta.enterprise.inject.spi.CDI;
 import jakarta.servlet.http.HttpServletRequest;
 
 /**
@@ -68,7 +69,8 @@ public class TreeMenuInclude implements PageInclude
 
     // Properties
     private static final String PROPERTY_ROOT_TREE = "lutece.root.tree";
-
+    private static IModeRepository _modeRepository = CDI.current( ).select( IModeRepository.class ).get( );
+    
     /**
      * Substitue specific Freemarker markers in the page template.
      * 
@@ -195,7 +197,7 @@ public String buildTreeMenuContent( int nIdPage, int nMode, HttpServletRequest r
                 break;
         }
 
-        Properties outputProperties = ModeHome.getOuputXslProperties( nMode );
+        Properties outputProperties = _modeRepository.findOuputXslProperties( nMode );
 
         // Added in v1.3
         // Add a path param for choose url to use in admin or normal mode
diff --git a/src/java/fr/paris/lutece/portal/web/style/PageTemplatesJspBean.java b/src/java/fr/paris/lutece/portal/web/style/PageTemplatesJspBean.java
index a4e4cde4c..3e9c603e6 100755
--- a/src/java/fr/paris/lutece/portal/web/style/PageTemplatesJspBean.java
+++ b/src/java/fr/paris/lutece/portal/web/style/PageTemplatesJspBean.java
@@ -37,12 +37,11 @@
 import java.util.Map;
 
 import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import jakarta.servlet.http.HttpServletRequest;
-
-
+import fr.paris.lutece.portal.business.style.IPageTemplateRepository;
 import fr.paris.lutece.portal.business.style.PageTemplate;
-import fr.paris.lutece.portal.business.style.PageTemplateHome;
 import fr.paris.lutece.portal.service.admin.AccessDeniedException;
 import fr.paris.lutece.portal.service.message.AdminMessage;
 import fr.paris.lutece.portal.service.message.AdminMessageService;
@@ -90,6 +89,9 @@ public class PageTemplatesJspBean extends AdminFeaturesPageJspBean
     // JSP
     private static final String JSP_DO_REMOVE_PAGE_TEMPLATE = "jsp/admin/style/DoRemovePageTemplate.jsp";
 
+    @Inject
+    private IPageTemplateRepository _repository;
+
     /**
      * Returns the list of page templates
      *
@@ -102,7 +104,7 @@ public String getManagePageTemplate( HttpServletRequest request )
         setPageTitleProperty( PROPERTY_PAGE_TITLE_PAGE_TEMPLATE_LIST );
 
         HashMap<String, Object> model = new HashMap<>( );
-        model.put( MARK_PAGE_TEMPLATES_LIST, PageTemplateHome.getPageTemplatesList( ) );
+        model.put( MARK_PAGE_TEMPLATES_LIST, _repository.findAll( ) );
 
         HtmlTemplate template = AppTemplateService.getTemplate( TEMPLATE_PAGE_TEMPLATES, getLocale( ), model );
 
@@ -123,7 +125,7 @@ public String getModifyPageTemplate( HttpServletRequest request )
         String strId = request.getParameter( Parameters.PAGE_TEMPLATE_ID );
 
         HashMap<String, Object> model = new HashMap<>( );
-        model.put( MARK_PAGE_TEMPLATE, PageTemplateHome.findByPrimaryKey( Integer.parseInt( strId ) ) );
+        model.put( MARK_PAGE_TEMPLATE, _repository.load( Integer.parseInt( strId ) ).get( ) );
         model.put( SecurityTokenService.MARK_TOKEN, getSecurityTokenService( ).getToken( request, TEMPLATE_MODIFY_PAGE_TEMPLATE ) );
 
         HtmlTemplate template = AppTemplateService.getTemplate( TEMPLATE_MODIFY_PAGE_TEMPLATE, getLocale( ), model );
@@ -152,9 +154,9 @@ public String doModifyPageTemplate( HttpServletRequest request ) throws AccessDe
             throw new AccessDeniedException( ERROR_INVALID_TOKEN );
         }
 
-        PageTemplate pageTemplate = PageTemplateHome.findByPrimaryKey( Integer.parseInt( strId ) );
+        PageTemplate pageTemplate = _repository.load( Integer.parseInt( strId ) ).get( );
         pageTemplate.setDescription( strDescription );
-        PageTemplateHome.update( pageTemplate );
+        _repository.update( pageTemplate );
 
         // If the process is successful, redirects towards the page template management
         // page
@@ -173,7 +175,7 @@ public String getConfirmRemovePageTemplate( HttpServletRequest request )
         String strId = request.getParameter( Parameters.PAGE_TEMPLATE_ID );
         int nId = Integer.parseInt( strId );
 
-        boolean bIsUsed = PageTemplateHome.checkStylePageTemplateIsUsed( nId );
+        boolean bIsUsed = _repository.isUsedByPage( nId );
 
         if ( !bIsUsed )
         {
@@ -206,7 +208,7 @@ public String doRemovePageTemplate( HttpServletRequest request ) throws AccessDe
         String strId = request.getParameter( Parameters.PAGE_TEMPLATE_ID );
         int nId = Integer.parseInt( strId );
 
-        PageTemplateHome.remove( nId );
+        _repository.remove( nId );
 
         return getHomeUrl( request );
     }
diff --git a/src/java/fr/paris/lutece/portal/web/style/StylesJspBean.java b/src/java/fr/paris/lutece/portal/web/style/StylesJspBean.java
index 8ae0f0065..3b305e4af 100644
--- a/src/java/fr/paris/lutece/portal/web/style/StylesJspBean.java
+++ b/src/java/fr/paris/lutece/portal/web/style/StylesJspBean.java
@@ -49,8 +49,8 @@
 import fr.paris.lutece.portal.business.portlet.PortletHome;
 import fr.paris.lutece.portal.business.portlet.PortletImpl;
 import fr.paris.lutece.portal.business.portlet.PortletTypeHome;
+import fr.paris.lutece.portal.business.style.IStyleRepository;
 import fr.paris.lutece.portal.business.style.Style;
-import fr.paris.lutece.portal.business.style.StyleHome;
 import fr.paris.lutece.portal.business.stylesheet.StyleSheet;
 import fr.paris.lutece.portal.service.admin.AccessDeniedException;
 import fr.paris.lutece.portal.service.message.AdminMessage;
@@ -115,7 +115,9 @@ public class StylesJspBean extends AdminFeaturesPageJspBean
     private static final String MESSAGE_CREATE_STYLE_ID_ALREADY_EXISTS = "portal.style.message.createStyle.idAlreadyExists";
     private static final String MESSAGE_CREATE_STYLE_COMPONENT_EXISTS = "portal.style.message.createStyle.componentHasAlreadyAStyle";
     private static final String MESSAGE_CONFIRM_DELETE_STYLESHEET = "portal.style.message.stylesheetConfirmDelete";
-    
+
+    @Inject
+    private IStyleRepository _repository;
     @Inject
     @Pager( listBookmark = MARK_STYLE_LIST, defaultItemsPerPage = PROPERTY_STYLES_PER_PAGE)
     private IPager<Style, Void> pager;
@@ -129,7 +131,7 @@ public class StylesJspBean extends AdminFeaturesPageJspBean
      */
     public String getStylesManagement( HttpServletRequest request )
     {
-        List<Style> listStyles = (List<Style>) StyleHome.getStylesList( );
+        List<Style> listStyles = (List<Style>) _repository.findAll( );
 
         String strSortedAttributeName = request.getParameter( Parameters.SORTED_ATTRIBUTE_NAME );
         String strAscSort = null;
@@ -175,7 +177,7 @@ public String getCreateStyle( HttpServletRequest request )
     {
         Map<String, Object> model = new HashMap<>( );
         model.put( MARK_PORTLET_TYPE_LIST, PortletTypeHome.getPortletsTypesList( getLocale( ) ) );
-        model.put( MARK_PORTAL_COMPONENT_LIST, StyleHome.getPortalComponentList( ) );
+        model.put( MARK_PORTAL_COMPONENT_LIST, _repository.findPortalComponents( ) );
         model.put( SecurityTokenService.MARK_TOKEN, getSecurityTokenService( ).getToken( request, TEMPLATE_CREATE_STYLE ) );
 
         HtmlTemplate template = AppTemplateService.getTemplate( TEMPLATE_CREATE_STYLE, getLocale( ), model );
@@ -213,7 +215,7 @@ public String doCreateStyle( HttpServletRequest request ) throws AccessDeniedExc
             return AdminMessageService.getMessageUrl( request, MESSAGE_CREATE_STYLE_INVALID_FORMAT_ID, AdminMessage.TYPE_STOP );
         }
 
-        Style styleExisting = StyleHome.findByPrimaryKey( nId );
+        Style styleExisting = _repository.load( nId ).orElse( null );
 
         if ( styleExisting != null )
         {
@@ -222,7 +224,7 @@ public String doCreateStyle( HttpServletRequest request ) throws AccessDeniedExc
 
         int nPortalComponentId = Integer.parseInt( request.getParameter( Parameters.PORTAL_COMPONENT ) );
 
-        if ( StyleHome.checkStylePortalComponent( nPortalComponentId ) && ( nPortalComponentId != PORTAL_COMPONENT_ID_PORTLET ) )
+        if ( _repository.existsPortalComponentForStyle( nPortalComponentId ) && ( nPortalComponentId != PORTAL_COMPONENT_ID_PORTLET ) )
         {
             return AdminMessageService.getMessageUrl( request, MESSAGE_CREATE_STYLE_COMPONENT_EXISTS, AdminMessage.TYPE_STOP );
         }
@@ -241,7 +243,7 @@ public String doCreateStyle( HttpServletRequest request ) throws AccessDeniedExc
         String strPortletTypeId = request.getParameter( Parameters.PORTLET_TYPE );
         strPortletTypeId = ( strPortletTypeId != null ) ? strPortletTypeId : "";
         style.setPortletTypeId( strPortletTypeId );
-        StyleHome.create( style );
+        _repository.create( style );
 
         return getHomeUrl( request );
     }
@@ -259,9 +261,9 @@ public String getModifyStyle( HttpServletRequest request )
         int nStyleId = Integer.parseInt( strIdStyles );
 
         Map<String, Object> model = new HashMap<>( );
-        model.put( MARK_STYLE, StyleHome.findByPrimaryKey( nStyleId ) );
+        model.put( MARK_STYLE, _repository.load( nStyleId ).get( ) );
         model.put( MARK_PORTLET_TYPE_LIST, PortletTypeHome.getPortletsTypesList( getLocale( ) ) );
-        model.put( MARK_PORTAL_COMPONENT_LIST, StyleHome.getPortalComponentList( ) );
+        model.put( MARK_PORTAL_COMPONENT_LIST, _repository.findPortalComponents( ) );
         model.put( SecurityTokenService.MARK_TOKEN, getSecurityTokenService( ).getToken( request, TEMPLATE_MODIFY_STYLE ) );
 
         HtmlTemplate template = AppTemplateService.getTemplate( TEMPLATE_MODIFY_STYLE, getLocale( ), model );
@@ -294,10 +296,10 @@ public String doModifyStyle( HttpServletRequest request ) throws AccessDeniedExc
             return AdminMessageService.getMessageUrl( request, Messages.MANDATORY_FIELDS, AdminMessage.TYPE_STOP );
         }
 
-        Style style = StyleHome.findByPrimaryKey( nStyleId );
+        Style style = _repository.load( nStyleId ).get( );
         int nPortalComponentOld = style.getPortalComponentId( );
 
-        if ( StyleHome.checkStylePortalComponent( nPortalComponentId ) && ( nPortalComponentId != PORTAL_COMPONENT_ID_PORTLET )
+        if ( _repository.existsPortalComponentForStyle( nPortalComponentId ) && ( nPortalComponentId != PORTAL_COMPONENT_ID_PORTLET )
                 && ( nPortalComponentId != nPortalComponentOld ) )
         {
             return AdminMessageService.getMessageUrl( request, MESSAGE_CREATE_STYLE_COMPONENT_EXISTS, AdminMessage.TYPE_STOP );
@@ -310,7 +312,7 @@ public String doModifyStyle( HttpServletRequest request ) throws AccessDeniedExc
         style.setPortletTypeId( strPortletTypeId );
         style.setPortalComponentId( nPortalComponentId );
         style.setDescription( strStyleDescription );
-        StyleHome.update( style );
+        _repository.update( style );
 
         return getHomeUrl( request );
     }
@@ -327,7 +329,7 @@ public String getConfirmRemoveStyle( HttpServletRequest request )
         String strId = request.getParameter( Parameters.STYLE_ID );
         int nId = Integer.parseInt( strId );
         Collection<PortletImpl> listPortlets = PortletHome.getPortletListByStyle( nId );
-        Collection<StyleSheet> listStyleSheets = StyleHome.getStyleSheetList( nId );
+        Collection<StyleSheet> listStyleSheets = _repository.findStyleSheetsByStyle( nId );
 
         if ( CollectionUtils.isNotEmpty( listPortlets ) )
         {
@@ -375,7 +377,7 @@ public String doRemoveStyle( HttpServletRequest request ) throws AccessDeniedExc
         }
         String strId = request.getParameter( Parameters.STYLE_ID );
         int nId = Integer.parseInt( strId );
-        StyleHome.remove( nId );
+        _repository.remove( nId );
 
         return getHomeUrl( request );
     }
diff --git a/src/java/fr/paris/lutece/portal/web/stylesheet/StyleSheetFileServlet.java b/src/java/fr/paris/lutece/portal/web/stylesheet/StyleSheetFileServlet.java
index bb913fa56..cc2ee8473 100644
--- a/src/java/fr/paris/lutece/portal/web/stylesheet/StyleSheetFileServlet.java
+++ b/src/java/fr/paris/lutece/portal/web/stylesheet/StyleSheetFileServlet.java
@@ -36,13 +36,13 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
+import jakarta.inject.Inject;
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-
+import fr.paris.lutece.portal.business.stylesheet.IStyleSheetRepository;
 import fr.paris.lutece.portal.business.stylesheet.StyleSheet;
-import fr.paris.lutece.portal.business.stylesheet.StyleSheetHome;
 import fr.paris.lutece.portal.business.user.AdminUser;
 import fr.paris.lutece.portal.service.admin.AdminUserService;
 import fr.paris.lutece.portal.web.constants.Parameters;
@@ -52,11 +52,11 @@
  */
 public class StyleSheetFileServlet extends HttpServlet
 {
-    /**
-     *
-     */
     private static final long serialVersionUID = 9154028959985088272L;
 
+    @Inject
+    private IStyleSheetRepository _styleSheetRepository;
+    
     /**
      * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
      * 
@@ -79,8 +79,8 @@ protected void processRequest( HttpServletRequest request, HttpServletResponse r
             {
                 int nStyleSheetId = Integer.parseInt( strStyleSheetId );
 
-                StyleSheet stylesheet = StyleSheetHome.findByPrimaryKey( nStyleSheetId );
-
+                StyleSheet stylesheet = _styleSheetRepository.load( nStyleSheetId ).get( );
+                
                 ServletContext context = getServletConfig( ).getServletContext( );
                 String strMimetype = context.getMimeType( stylesheet.getFile( ) );
                 response.setContentType( ( strMimetype != null ) ? strMimetype : "application/octet-stream" );
diff --git a/src/java/fr/paris/lutece/portal/web/stylesheet/StyleSheetJspBean.java b/src/java/fr/paris/lutece/portal/web/stylesheet/StyleSheetJspBean.java
index b51d26404..052c32c58 100644
--- a/src/java/fr/paris/lutece/portal/web/stylesheet/StyleSheetJspBean.java
+++ b/src/java/fr/paris/lutece/portal/web/stylesheet/StyleSheetJspBean.java
@@ -52,11 +52,11 @@
 import fr.paris.lutece.portal.business.portalcomponent.PortalComponentHome;
 import fr.paris.lutece.portal.business.portlet.PortletType;
 import fr.paris.lutece.portal.business.portlet.PortletTypeHome;
-import fr.paris.lutece.portal.business.style.ModeHome;
+import fr.paris.lutece.portal.business.style.IModeRepository;
+import fr.paris.lutece.portal.business.style.IStyleRepository;
 import fr.paris.lutece.portal.business.style.Style;
-import fr.paris.lutece.portal.business.style.StyleHome;
+import fr.paris.lutece.portal.business.stylesheet.IStyleSheetRepository;
 import fr.paris.lutece.portal.business.stylesheet.StyleSheet;
-import fr.paris.lutece.portal.business.stylesheet.StyleSheetHome;
 import fr.paris.lutece.portal.service.admin.AccessDeniedException;
 import fr.paris.lutece.portal.service.fileupload.FileUploadService;
 import fr.paris.lutece.portal.service.i18n.I18nService;
@@ -121,6 +121,12 @@ public class StyleSheetJspBean extends AdminFeaturesPageJspBean
     private static final String JSP_DO_REMOVE_STYLESHEET = "jsp/admin/style/DoRemoveStyleSheet.jsp";
     private static final String JSP_REMOVE_STYLE = "RemoveStyle.jsp";
 
+    @Inject
+    private IStyleSheetRepository _styleSheetrepository;
+    @Inject
+    private IStyleRepository _styleRepository;
+    @Inject
+    private IModeRepository _modeRepository;
     @Inject
     @Pager( listBookmark = MARK_STYLESHEET_LIST, defaultItemsPerPage = PROPERTY_STYLESHEETS_PER_PAGE)
     private IPager<StyleSheet, Void> pager;
@@ -140,11 +146,11 @@ public String getManageStyleSheet( HttpServletRequest request )
 
         int nModeId = Integer.parseInt( strModeId );
 
-        ReferenceList listModes = ModeHome.getModes( );
+        ReferenceList listModes = _modeRepository.findAllToReferenceList( );
         String strComboItem = I18nService.getLocalizedString( LABEL_ALL, getLocale( ) );
         listModes.addItem( -1, strComboItem );
 
-        List<StyleSheet> listStyleSheets = (List<StyleSheet>) StyleSheetHome.getStyleSheetList( nModeId );
+        List<StyleSheet> listStyleSheets = (List<StyleSheet>) _styleSheetrepository.findByMode( nModeId );
 
         String strSortedAttributeName = request.getParameter( Parameters.SORTED_ATTRIBUTE_NAME );
         String strAscSort = null;
@@ -198,7 +204,7 @@ public String getCreateStyleSheet( HttpServletRequest request )
 
         Map<String, Object> model = new HashMap<>( );
         model.put( MARK_STYLE_LIST, getStyleList( ) );
-        model.put( MARK_MODE_LIST, ModeHome.getModes( ) );
+        model.put( MARK_MODE_LIST, _modeRepository.findAllToReferenceList( ) );
         model.put( MARK_MODE_ID, strModeId );
         model.put( SecurityTokenService.MARK_TOKEN, getSecurityTokenService( ).getToken( request, TEMPLATE_CREATE_STYLESHEET ) );
 
@@ -232,7 +238,7 @@ public String doCreateStyleSheet( HttpServletRequest request ) throws AccessDeni
         }
 
         // insert in the table stylesheet of the database
-        StyleSheetHome.create( stylesheet );
+        _styleSheetrepository.create( stylesheet );
 
         // Displays the list of the stylesheet files
         return getHomeUrl( request );
@@ -267,7 +273,7 @@ private String getData( MultipartHttpServletRequest multipartRequest, StyleSheet
         // test the existence of style or mode already associate with this stylesheet
         int nStyleId = Integer.parseInt( strStyleId );
         int nModeId = Integer.parseInt( strModeId );
-        int nCount = StyleSheetHome.getStyleSheetNbPerStyleMode( nStyleId, nModeId );
+        int nCount = _styleSheetrepository.countPerStyleAndMode( nStyleId, nModeId );
 
         // Do not create a stylesheet of there is already one
         if ( ( nCount >= 1 ) && ( stylesheet.getId( ) == 0 /* creation */ ) )
@@ -308,8 +314,8 @@ public String getModifyStyleSheet( HttpServletRequest request )
 
         Map<String, Object> model = new HashMap<>( );
         model.put( MARK_STYLE_LIST, getStyleList( ) );
-        model.put( MARK_MODE_LIST, ModeHome.getModes( ) );
-        model.put( MARK_STYLESHEET, StyleSheetHome.findByPrimaryKey( nId ) );
+        model.put( MARK_MODE_LIST, _modeRepository.findAllToReferenceList( ) );
+        model.put( MARK_STYLESHEET, _styleSheetrepository.load( nId ).get( ) );
         model.put( SecurityTokenService.MARK_TOKEN, getSecurityTokenService( ).getToken( request, TEMPLATE_MODIFY_STYLESHEET ) );
 
         HtmlTemplate template = AppTemplateService.getTemplate( TEMPLATE_MODIFY_STYLESHEET, getLocale( ), model );
@@ -324,7 +330,7 @@ public String getModifyStyleSheet( HttpServletRequest request )
      */
     public ReferenceList getStyleList( )
     {
-        Collection<Style> stylesList = StyleHome.getStylesList( );
+        Collection<Style> stylesList = _styleRepository.findAll( );
         ReferenceList stylesListWithLabels = new ReferenceList( );
 
         for ( Style style : stylesList )
@@ -358,7 +364,7 @@ public String doModifyStyleSheet( HttpServletRequest request ) throws AccessDeni
     {
         MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
         int nId = Integer.parseInt( multipartRequest.getParameter( Parameters.STYLESHEET_ID ) );
-        StyleSheet stylesheet = StyleSheetHome.findByPrimaryKey( nId );
+        StyleSheet stylesheet = _styleSheetrepository.load( nId ).get( );
         String strErrorUrl = getData( multipartRequest, stylesheet );
 
         if ( strErrorUrl != null )
@@ -371,7 +377,7 @@ public String doModifyStyleSheet( HttpServletRequest request ) throws AccessDeni
         }
 
         // Update the stylesheet in database
-        StyleSheetHome.update( stylesheet );
+        _styleSheetrepository.update( stylesheet );
 
         // Displays the management stylesheet page
         return getHomeUrl( request );
@@ -388,7 +394,7 @@ public String getRemoveStyleSheet( HttpServletRequest request )
     {
         String strId = request.getParameter( Parameters.STYLESHEET_ID );
 
-        StyleSheet stylesheet = StyleSheetHome.findByPrimaryKey( Integer.parseInt( strId ) );
+        StyleSheet stylesheet = _styleSheetrepository.load( Integer.parseInt( strId ) ).get( );
         Object [ ] args = {
                 stylesheet.getDescription( )
         };
@@ -418,7 +424,7 @@ public String doRemoveStyleSheet( HttpServletRequest request ) throws AccessDeni
         }
         int nId = Integer.parseInt( request.getParameter( Parameters.STYLESHEET_ID ) );
         int nIdStyle = Integer.parseInt( request.getParameter( Parameters.STYLE_ID ) );
-        StyleSheetHome.remove( nId );
+        _styleSheetrepository.remove( nId );
 
         return JSP_REMOVE_STYLE + "?" + Parameters.STYLE_ID + "=" + nIdStyle;
     }
diff --git a/src/java/fr/paris/lutece/portal/web/xpages/SiteMapApp.java b/src/java/fr/paris/lutece/portal/web/xpages/SiteMapApp.java
index 03edce7ea..d6db26719 100644
--- a/src/java/fr/paris/lutece/portal/web/xpages/SiteMapApp.java
+++ b/src/java/fr/paris/lutece/portal/web/xpages/SiteMapApp.java
@@ -37,7 +37,7 @@
 import fr.paris.lutece.portal.business.page.Page;
 import fr.paris.lutece.portal.business.page.PageHome;
 import fr.paris.lutece.portal.business.portalcomponent.PortalComponentHome;
-import fr.paris.lutece.portal.business.style.ModeHome;
+import fr.paris.lutece.portal.business.style.IModeRepository;
 import fr.paris.lutece.portal.business.stylesheet.StyleSheet;
 import fr.paris.lutece.portal.service.cache.Lutece107Cache;
 import fr.paris.lutece.portal.service.cache.LuteceCache;
@@ -94,7 +94,9 @@ public class SiteMapApp implements XPageApplication
     @Inject
 	@LuteceCache(cacheName = CACHE_NAME, keyType = String.class, valueType = String.class, enable = true)
 	private Lutece107Cache<String, String> _cacheSiteMap;
-
+    @Inject
+    private IModeRepository _modeRepository;
+    
     /**
      * Creates a new SiteMapPage object
      */
@@ -245,7 +247,7 @@ private String buildPageContent( int nMode, HttpServletRequest request )
             mapParamRequest.put( MARKER_TARGET, TARGET_TOP );
         }
 
-        Properties outputProperties = ModeHome.getOuputXslProperties( nMode );
+        Properties outputProperties = _modeRepository.findOuputXslProperties( nMode );
 
         XmlTransformerService xmlTransformerService = new XmlTransformerService( );
 
diff --git a/src/test/java/fr/paris/lutece/portal/business/page/PageDAOTest.java b/src/test/java/fr/paris/lutece/portal/business/page/PageDAOTest.java
index f111401d5..16a50c6e0 100644
--- a/src/test/java/fr/paris/lutece/portal/business/page/PageDAOTest.java
+++ b/src/test/java/fr/paris/lutece/portal/business/page/PageDAOTest.java
@@ -41,7 +41,7 @@
 
 import fr.paris.lutece.portal.business.role.Role;
 import fr.paris.lutece.portal.business.role.RoleHome;
-import fr.paris.lutece.portal.business.style.PageTemplateHome;
+import fr.paris.lutece.portal.business.style.IPageTemplateRepository;
 import fr.paris.lutece.portal.service.page.IPageService;
 import fr.paris.lutece.portal.service.portal.PortalService;
 import fr.paris.lutece.portal.service.workgroup.AdminWorkgroupService;
@@ -54,6 +54,8 @@ public class PageDAOTest extends LuteceTestCase
     private IPageService pageService;
     @Inject 
     private IPageDAO dao;
+    @Inject
+    private IPageTemplateRepository _pageTemplateRepository;
     
     @Test
     public void testGetPagesByRoleKey( )
@@ -74,7 +76,7 @@ public void testGetPagesByRoleKey( )
             String randomPageName = "page" + rnd.nextLong( );
             page = new Page( );
             page.setParentPageId( PortalService.getRootPageId( ) );
-            page.setPageTemplateId( PageTemplateHome.getPageTemplatesList( ).get( 0 ).getId( ) );
+            page.setPageTemplateId( _pageTemplateRepository.findAll( ).stream( ).findFirst( ).get( ).getId( ) );
             page.setName( randomPageName );
             page.setRole( randomRoleName );
             page.setDateUpdate( new Timestamp( new java.util.Date( ).getTime( ) ) );
diff --git a/src/test/java/fr/paris/lutece/portal/business/style/PageTemplateTest.java b/src/test/java/fr/paris/lutece/portal/business/style/PageTemplateTest.java
index 30235d6dc..42cc22ab5 100644
--- a/src/test/java/fr/paris/lutece/portal/business/style/PageTemplateTest.java
+++ b/src/test/java/fr/paris/lutece/portal/business/style/PageTemplateTest.java
@@ -34,8 +34,10 @@
 package fr.paris.lutece.portal.business.style;
 
 import fr.paris.lutece.test.LuteceTestCase;
+import jakarta.inject.Inject;
 
-import java.util.List;
+import java.util.Collection;
+import java.util.NoSuchElementException;
 
 import org.junit.jupiter.api.Test;
 
@@ -48,6 +50,9 @@ public class PageTemplateTest extends LuteceTestCase
     private final static String PICTURE1 = "Picture 1";
     private final static String PICTURE2 = "Picture 2";
 
+    @Inject
+    private IPageTemplateRepository _repository;
+    
     @Test
     public void testBusinessPageTemplate( )
     {
@@ -58,9 +63,9 @@ public void testBusinessPageTemplate( )
         pageTemplate.setPicture( PICTURE1 );
 
         // Create test
-        PageTemplateHome.create( pageTemplate );
+        _repository.create( pageTemplate );
 
-        PageTemplate pageTemplateStored = PageTemplateHome.findByPrimaryKey( pageTemplate.getId( ) );
+        PageTemplate pageTemplateStored = _repository.load( pageTemplate.getId( ) ).get( );
         assertEquals( pageTemplateStored.getDescription( ), pageTemplate.getDescription( ) );
         assertEquals( pageTemplateStored.getFile( ), pageTemplate.getFile( ) );
         assertEquals( pageTemplateStored.getPicture( ), pageTemplate.getPicture( ) );
@@ -69,19 +74,18 @@ public void testBusinessPageTemplate( )
         pageTemplate.setDescription( DESCRIPTION2 );
         pageTemplate.setFile( FILE2 );
         pageTemplate.setPicture( PICTURE2 );
-        PageTemplateHome.update( pageTemplate );
-        pageTemplateStored = PageTemplateHome.findByPrimaryKey( pageTemplate.getId( ) );
+        _repository.update( pageTemplate );
+        pageTemplateStored = _repository.load( pageTemplate.getId( ) ).get( );
         assertEquals( pageTemplateStored.getDescription( ), pageTemplate.getDescription( ) );
         assertEquals( pageTemplateStored.getFile( ), pageTemplate.getFile( ) );
         assertEquals( pageTemplateStored.getPicture( ), pageTemplate.getPicture( ) );
 
         // List test
-        List<?> listPageTemplates = PageTemplateHome.getPageTemplatesList( );
+        Collection<PageTemplate> listPageTemplates = _repository.findAll( );
         assertTrue( listPageTemplates.size( ) > 0 );
 
         // Delete test
-        PageTemplateHome.remove( pageTemplate.getId( ) );
-        pageTemplateStored = PageTemplateHome.findByPrimaryKey( pageTemplate.getId( ) );
-        assertNull( pageTemplateStored );
+        _repository.remove( pageTemplate.getId( ) );
+        assertThrows( NoSuchElementException.class, ( ) -> _repository.load( pageTemplate.getId( ) ).get( ) );
     }
 }
diff --git a/src/test/java/fr/paris/lutece/portal/business/style/StyleTest.java b/src/test/java/fr/paris/lutece/portal/business/style/StyleTest.java
index 0dcb9a56d..bf8e88afa 100644
--- a/src/test/java/fr/paris/lutece/portal/business/style/StyleTest.java
+++ b/src/test/java/fr/paris/lutece/portal/business/style/StyleTest.java
@@ -33,9 +33,12 @@
  */
 package fr.paris.lutece.portal.business.style;
 
+import java.util.NoSuchElementException;
+
 import org.junit.jupiter.api.Test;
 
 import fr.paris.lutece.test.LuteceTestCase;
+import jakarta.inject.Inject;
 
 public class StyleTest extends LuteceTestCase
 {
@@ -49,7 +52,9 @@ public class StyleTest extends LuteceTestCase
     private final static String DESCRIPTION2 = "Description 2";
     private final static String PORTLETTYPENAME1 = "PortletTypeName 1";
     private final static String PORTALCOMPONENTNAME1 = "PortalComponentName 1";
-
+    @Inject
+    private IStyleRepository _repository;
+    
     @Test
     public void testBusinessStyle( )
     {
@@ -63,9 +68,9 @@ public void testBusinessStyle( )
         style.setPortalComponentName( PORTALCOMPONENTNAME1 );
 
         // Create test
-        StyleHome.create( style );
+        _repository.create( style );
 
-        Style styleStored = StyleHome.findByPrimaryKey( style.getId( ) );
+        Style styleStored = _repository.load( style.getId( ) ).get( );
         assertEquals( styleStored.getPortalComponentId( ), style.getPortalComponentId( ) );
         assertEquals( styleStored.getPortletTypeId( ), style.getPortletTypeId( ) );
         assertEquals( styleStored.getDescription( ), style.getDescription( ) );
@@ -74,21 +79,20 @@ public void testBusinessStyle( )
         style.setPortalComponentId( PORTALCOMPONENTID2 );
         style.setPortletTypeId( PORTLETTYPEID2 );
         style.setDescription( DESCRIPTION2 );
-        StyleHome.update( style );
-        styleStored = StyleHome.findByPrimaryKey( style.getId( ) );
+        _repository.update( style );
+        styleStored = _repository.load( style.getId( ) ).get( );
         assertEquals( styleStored.getPortalComponentId( ), style.getPortalComponentId( ) );
         assertEquals( styleStored.getPortletTypeId( ), style.getPortletTypeId( ) );
         assertEquals( styleStored.getDescription( ), style.getDescription( ) );
 
         // List test
-        StyleHome.getPortalComponentList( );
-        StyleHome.getStylesList( );
-        StyleHome.getStyleSheetList( style.getId( ) );
-        StyleHome.checkStylePortalComponent( TEST_PORTAL_COMPONENT_ID );
+        _repository.findPortalComponents( );
+        _repository.findAll( );
+        _repository.findStyleSheetsByStyle( style.getId( ) );
+        _repository.existsPortalComponentForStyle( TEST_PORTAL_COMPONENT_ID );
 
         // Delete test
-        StyleHome.remove( style.getId( ) );
-        styleStored = StyleHome.findByPrimaryKey( style.getId( ) );
-        assertNull( styleStored );
+        _repository.remove( style.getId( ) );
+        assertThrows( NoSuchElementException.class, ( ) -> _repository.load( style.getId( ) ).get( ) );
     }
 }
diff --git a/src/test/java/fr/paris/lutece/portal/business/stylesheet/StyleSheetTest.java b/src/test/java/fr/paris/lutece/portal/business/stylesheet/StyleSheetTest.java
index 3deff04b4..3cd2c63a4 100644
--- a/src/test/java/fr/paris/lutece/portal/business/stylesheet/StyleSheetTest.java
+++ b/src/test/java/fr/paris/lutece/portal/business/stylesheet/StyleSheetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2022, City of Paris
+ * Copyright (c) 2002-2025, City of Paris
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,9 +33,12 @@
  */
 package fr.paris.lutece.portal.business.stylesheet;
 
+import java.util.NoSuchElementException;
+
 import org.junit.jupiter.api.Test;
 
 import fr.paris.lutece.test.LuteceTestCase;
+import jakarta.inject.Inject;
 
 public class StyleSheetTest extends LuteceTestCase
 {
@@ -45,6 +48,8 @@ public class StyleSheetTest extends LuteceTestCase
     private final static String FILE2 = "Fileamne 2";
     private final static String SOURCE1 = "<xsl Source 1>";
     private final static String SOURCE2 = "<xsl Source 2>";
+    @Inject
+    private StyleSheetRepository _styleSheetRepository;
 
     @Test
     public void testBusiness( )
@@ -56,9 +61,9 @@ public void testBusiness( )
         styleSheet.setSource( SOURCE1.getBytes( ) );
 
         // Create test
-        StyleSheetHome.create( styleSheet );
+        _styleSheetRepository.create( styleSheet );
 
-        StyleSheet styleSheetStored = StyleSheetHome.findByPrimaryKey( styleSheet.getId( ) );
+        StyleSheet styleSheetStored = _styleSheetRepository.load( styleSheet.getId( ) ).get( );
         assertEquals( styleSheetStored.getDescription( ), styleSheet.getDescription( ) );
         assertEquals( styleSheetStored.getFile( ), styleSheet.getFile( ) );
         assertEquals( styleSheetStored.getSource( ).length, styleSheet.getSource( ).length );
@@ -68,18 +73,17 @@ public void testBusiness( )
         styleSheet.setFile( FILE2 );
         styleSheet.setSource( SOURCE2.getBytes( ) );
 
-        StyleSheetHome.update( styleSheet );
-        styleSheetStored = StyleSheetHome.findByPrimaryKey( styleSheet.getId( ) );
+        _styleSheetRepository.update( styleSheet );
+        styleSheetStored = _styleSheetRepository.load( styleSheet.getId( ) ).get( );
         assertEquals( styleSheetStored.getDescription( ), styleSheet.getDescription( ) );
         assertEquals( styleSheetStored.getFile( ), styleSheet.getFile( ) );
         assertEquals( styleSheetStored.getSource( ).length, styleSheet.getSource( ).length );
 
         // List Test
-        StyleSheetHome.getStyleSheetList( 0 );
+        _styleSheetRepository.findByMode( 0 );
 
         // Delete test
-        StyleSheetHome.remove( styleSheet.getId( ) );
-        styleSheetStored = StyleSheetHome.findByPrimaryKey( styleSheet.getId( ) );
-        assertNull( styleSheetStored );
+        _styleSheetRepository.remove( styleSheet.getId( ) );
+        assertThrows( NoSuchElementException.class, ( ) -> _styleSheetRepository.load( styleSheet.getId( ) ).get( ) );
     }
 }
diff --git a/src/test/java/fr/paris/lutece/portal/web/admin/AdminPageJspBeanTest.java b/src/test/java/fr/paris/lutece/portal/web/admin/AdminPageJspBeanTest.java
index aa008ae0d..d4b319d5c 100755
--- a/src/test/java/fr/paris/lutece/portal/web/admin/AdminPageJspBeanTest.java
+++ b/src/test/java/fr/paris/lutece/portal/web/admin/AdminPageJspBeanTest.java
@@ -55,7 +55,7 @@
 import fr.paris.lutece.portal.business.rbac.RBAC;
 import fr.paris.lutece.portal.business.rbac.RBACHome;
 import fr.paris.lutece.portal.business.rbac.RBACRole;
-import fr.paris.lutece.portal.business.style.PageTemplateHome;
+import fr.paris.lutece.portal.business.style.IPageTemplateRepository;
 import fr.paris.lutece.portal.business.user.AdminUser;
 import fr.paris.lutece.portal.service.admin.AccessDeniedException;
 import fr.paris.lutece.portal.service.admin.PasswordResetException;
@@ -89,6 +89,8 @@ public class AdminPageJspBeanTest extends LuteceTestCase
     private IPageService pageService;
     @Inject 
     private ISecurityTokenService _securityTokenService;
+    @Inject
+    private IPageTemplateRepository _pageTemplateRepository;
 
     @BeforeEach
     protected void setUp( ) throws Exception
@@ -96,7 +98,7 @@ protected void setUp( ) throws Exception
         _randomPageName = "page" + new SecureRandom( ).nextLong( );
         _page = new Page( );
         _page.setParentPageId( PortalService.getRootPageId( ) );
-        _page.setPageTemplateId( PageTemplateHome.getPageTemplatesList( ).get( 0 ).getId( ) );
+        _page.setPageTemplateId( _pageTemplateRepository.findAll( ).stream( ).findFirst( ).get( ).getId( ) );
         _page.setName( _randomPageName );
         _page.setDescription( _randomPageName );
         _page.setMetaKeywords( "" );
@@ -243,7 +245,7 @@ public void testDoRemovePageWithChild( ) throws AccessDeniedException
         {
             childPage = new Page( );
             childPage.setParentPageId( _page.getId( ) );
-            childPage.setPageTemplateId( PageTemplateHome.getPageTemplatesList( ).get( 0 ).getId( ) );
+            childPage.setPageTemplateId( _pageTemplateRepository.findAll( ).stream( ).findFirst( ).get( ).getId( ) );
             childPage.setName( childPageName );
             pageService.createPage( childPage );
             MockHttpServletRequest request = new MockHttpServletRequest( );
diff --git a/src/test/java/fr/paris/lutece/portal/web/style/PageTemplatesJspBeanTest.java b/src/test/java/fr/paris/lutece/portal/web/style/PageTemplatesJspBeanTest.java
index 8fd917aa2..c96e05124 100755
--- a/src/test/java/fr/paris/lutece/portal/web/style/PageTemplatesJspBeanTest.java
+++ b/src/test/java/fr/paris/lutece/portal/web/style/PageTemplatesJspBeanTest.java
@@ -38,14 +38,15 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.Random;
 
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import fr.paris.lutece.portal.business.style.IPageTemplateRepository;
 import fr.paris.lutece.portal.business.style.PageTemplate;
-import fr.paris.lutece.portal.business.style.PageTemplateHome;
 import fr.paris.lutece.portal.business.user.AdminUser;
 import fr.paris.lutece.portal.service.admin.AccessDeniedException;
 import fr.paris.lutece.portal.service.message.AdminMessage;
@@ -67,15 +68,18 @@ public class PageTemplatesJspBeanTest extends LuteceTestCase
 {
     private static final String TEST_PAGE_TEMPLATE_ID = "1"; // Page template one column
     private MockHttpServletRequest request;
+    @Inject
     private PageTemplatesJspBean instance;
-    private @Inject ISecurityTokenService _securityTokenService;
-
+    @Inject
+    private ISecurityTokenService _securityTokenService;
+    @Inject
+    private IPageTemplateRepository _repository;
+    
     @BeforeEach
     protected void setUp( ) throws Exception
     {
         request = new MockHttpServletRequest( );
         AdminUserUtils.registerAdminUserWithRigth( request, new AdminUser( ), PageTemplatesJspBean.RIGHT_MANAGE_PAGE_TEMPLATES );
-        instance = new PageTemplatesJspBean( );
         instance.init( request, PageTemplatesJspBean.RIGHT_MANAGE_PAGE_TEMPLATES );
     }
 
@@ -109,7 +113,7 @@ public void testDoModifyPageTemplate( ) throws AccessDeniedException
         final String desc = getRandomName( );
         PageTemplate pageTemplate = new PageTemplate( );
         pageTemplate.setDescription( desc );
-        PageTemplateHome.create( pageTemplate );
+        _repository.create( pageTemplate );
 
         Map<String, String [ ]> parameters = new HashMap<>( );
         parameters.put( Parameters.PAGE_TEMPLATE_ID, new String [ ] {
@@ -124,13 +128,13 @@ public void testDoModifyPageTemplate( ) throws AccessDeniedException
         MultipartHttpServletRequest multipartRequest = new MultipartHttpServletRequest( request, Collections.emptyMap( ), parameters );
         try
         {
-            assertEquals( desc, PageTemplateHome.findByPrimaryKey( pageTemplate.getId( ) ).getDescription( ) );
+            assertEquals( desc, _repository.load( pageTemplate.getId( ) ).get( ).getDescription( ) );
             instance.doModifyPageTemplate( multipartRequest );
-            assertEquals( desc + "mod", PageTemplateHome.findByPrimaryKey( pageTemplate.getId( ) ).getDescription( ) );
+            assertEquals( desc + "mod", _repository.load( pageTemplate.getId( ) ).get( ).getDescription( ) );
         }
         finally
         {
-            PageTemplateHome.remove( pageTemplate.getId( ) );
+            _repository.remove( pageTemplate.getId( ) );
         }
     }
 
@@ -140,7 +144,7 @@ public void testDoModifyPageTemplateInvalidToken( ) throws AccessDeniedException
         final String desc = getRandomName( );
         PageTemplate pageTemplate = new PageTemplate( );
         pageTemplate.setDescription( desc );
-        PageTemplateHome.create( pageTemplate );
+        _repository.create( pageTemplate );
 
         Map<String, String [ ]> parameters = new HashMap<>( );
         parameters.put( Parameters.PAGE_TEMPLATE_ID, new String [ ] {
@@ -155,17 +159,17 @@ public void testDoModifyPageTemplateInvalidToken( ) throws AccessDeniedException
         MultipartHttpServletRequest multipartRequest = new MultipartHttpServletRequest( request, Collections.emptyMap( ), parameters );
         try
         {
-            assertEquals( desc, PageTemplateHome.findByPrimaryKey( pageTemplate.getId( ) ).getDescription( ) );
+            assertEquals( desc, _repository.load( pageTemplate.getId( ) ).get( ).getDescription( ) );
             instance.doModifyPageTemplate( multipartRequest );
             fail( "Should have thrown" );
         }
         catch( AccessDeniedException e )
         {
-            assertEquals( desc, PageTemplateHome.findByPrimaryKey( pageTemplate.getId( ) ).getDescription( ) );
+            assertEquals( desc, _repository.load( pageTemplate.getId( ) ).get( ).getDescription( ) );
         }
         finally
         {
-            PageTemplateHome.remove( pageTemplate.getId( ) );
+            _repository.remove( pageTemplate.getId( ) );
         }
     }
 
@@ -175,7 +179,7 @@ public void testDoModifyPageTemplateNoToken( ) throws AccessDeniedException
         final String desc = getRandomName( );
         PageTemplate pageTemplate = new PageTemplate( );
         pageTemplate.setDescription( desc );
-        PageTemplateHome.create( pageTemplate );
+        _repository.create( pageTemplate );
 
         Map<String, String [ ]> parameters = new HashMap<>( );
         parameters.put( Parameters.PAGE_TEMPLATE_ID, new String [ ] {
@@ -187,17 +191,17 @@ public void testDoModifyPageTemplateNoToken( ) throws AccessDeniedException
         MultipartHttpServletRequest multipartRequest = new MultipartHttpServletRequest( request, Collections.emptyMap( ), parameters );
         try
         {
-            assertEquals( desc, PageTemplateHome.findByPrimaryKey( pageTemplate.getId( ) ).getDescription( ) );
+            assertEquals( desc, _repository.load( pageTemplate.getId( ) ).get( ).getDescription( ) );
             instance.doModifyPageTemplate( multipartRequest );
             fail( "Should have thrown" );
         }
         catch( AccessDeniedException e )
         {
-            assertEquals( desc, PageTemplateHome.findByPrimaryKey( pageTemplate.getId( ) ).getDescription( ) );
+            assertEquals( desc, _repository.load( pageTemplate.getId( ) ).get( ).getDescription( ) );
         }
         finally
         {
-            PageTemplateHome.remove( pageTemplate.getId( ) );
+            _repository.remove( pageTemplate.getId( ) );
         }
     }
 
@@ -223,7 +227,7 @@ public void testDoRemovePageTemplate( ) throws AccessDeniedException
         pageTemplate.setDescription( desc );
         pageTemplate.setFile( "junit" );
         pageTemplate.setPicture( "junit" );
-        PageTemplateHome.create( pageTemplate );
+        _repository.create( pageTemplate );
 
         request.addParameter( Parameters.PAGE_TEMPLATE_ID, Integer.toString( pageTemplate.getId( ) ) );
         request.addParameter( SecurityTokenService.PARAMETER_TOKEN,
@@ -231,11 +235,11 @@ public void testDoRemovePageTemplate( ) throws AccessDeniedException
         try
         {
             instance.doRemovePageTemplate( request );
-            assertNull( PageTemplateHome.findByPrimaryKey( pageTemplate.getId( ) ) );
+            assertThrows( NoSuchElementException.class, ( ) -> _repository.load( pageTemplate.getId( ) ).get( ) );
         }
         finally
         {
-            PageTemplateHome.remove( pageTemplate.getId( ) );
+            _repository.remove( pageTemplate.getId( ) );
         }
     }
 
@@ -247,7 +251,7 @@ public void testDoRemovePageTemplateInvalidToken( ) throws AccessDeniedException
         pageTemplate.setDescription( desc );
         pageTemplate.setFile( "junit" );
         pageTemplate.setPicture( "junit" );
-        PageTemplateHome.create( pageTemplate );
+        _repository.create( pageTemplate );
 
         request.addParameter( Parameters.PAGE_TEMPLATE_ID, Integer.toString( pageTemplate.getId( ) ) );
         request.addParameter( SecurityTokenService.PARAMETER_TOKEN,
@@ -259,11 +263,11 @@ public void testDoRemovePageTemplateInvalidToken( ) throws AccessDeniedException
         }
         catch( AccessDeniedException e )
         {
-            assertNotNull( PageTemplateHome.findByPrimaryKey( pageTemplate.getId( ) ) );
+            assertNotNull( _repository.load( pageTemplate.getId( ) ).get( ) );
         }
         finally
         {
-            PageTemplateHome.remove( pageTemplate.getId( ) );
+            _repository.remove( pageTemplate.getId( ) );
         }
     }
 
@@ -275,7 +279,7 @@ public void testDoRemovePageTemplateNoToken( ) throws AccessDeniedException
         pageTemplate.setDescription( desc );
         pageTemplate.setFile( "junit" );
         pageTemplate.setPicture( "junit" );
-        PageTemplateHome.create( pageTemplate );
+        _repository.create( pageTemplate );
 
         request.addParameter( Parameters.PAGE_TEMPLATE_ID, Integer.toString( pageTemplate.getId( ) ) );
         try
@@ -285,11 +289,11 @@ public void testDoRemovePageTemplateNoToken( ) throws AccessDeniedException
         }
         catch( AccessDeniedException e )
         {
-            assertNotNull( PageTemplateHome.findByPrimaryKey( pageTemplate.getId( ) ) );
+            assertNotNull( _repository.load( pageTemplate.getId( ) ).get( ) );
         }
         finally
         {
-            PageTemplateHome.remove( pageTemplate.getId( ) );
+            _repository.remove( pageTemplate.getId( ) );
         }
     }
 
diff --git a/src/test/java/fr/paris/lutece/portal/web/style/StylesJspBeanTest.java b/src/test/java/fr/paris/lutece/portal/web/style/StylesJspBeanTest.java
index 12a5f577d..47c5a746f 100644
--- a/src/test/java/fr/paris/lutece/portal/web/style/StylesJspBeanTest.java
+++ b/src/test/java/fr/paris/lutece/portal/web/style/StylesJspBeanTest.java
@@ -35,6 +35,7 @@
 
 import java.math.BigInteger;
 import java.security.SecureRandom;
+import java.util.NoSuchElementException;
 import java.util.Random;
 
 import org.apache.commons.lang3.StringUtils;
@@ -42,10 +43,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import fr.paris.lutece.portal.business.style.IStyleRepository;
 import fr.paris.lutece.portal.business.style.Style;
-import fr.paris.lutece.portal.business.style.StyleHome;
+import fr.paris.lutece.portal.business.stylesheet.IStyleSheetRepository;
 import fr.paris.lutece.portal.business.stylesheet.StyleSheet;
-import fr.paris.lutece.portal.business.stylesheet.StyleSheetHome;
 import fr.paris.lutece.portal.business.user.AdminUser;
 import fr.paris.lutece.portal.service.admin.AccessDeniedException;
 import fr.paris.lutece.portal.service.message.AdminMessage;
@@ -69,22 +70,26 @@ public class StylesJspBeanTest extends LuteceTestCase
     private Style style;
     @Inject
     private ISecurityTokenService _securityTokenService;
+    @Inject
+    private IStyleSheetRepository _styleSheetRepository;
+    @Inject
+    private IStyleRepository _styleRepository;
 
     @BeforeEach
     protected void setUp( ) throws Exception
     {
         style = new Style( );
-        int nId = StyleHome.getStylesList( ).stream( ).map( Style::getId ).max( Integer::compare ).get( ) + 1;
+        int nId = _styleRepository.findAll( ).stream( ).map( Style::getId ).max( Integer::compare ).get( ) + 1;
         style.setId( nId );
         style.setDescription( getRandomName( ) );
         style.setPortalComponentId( 2 );
-        StyleHome.create( style );
+        _styleRepository.create( style );
     }
 
     @AfterEach
     protected void tearDown( ) throws Exception
     {
-        StyleHome.remove( style.getId( ) );
+        _styleRepository.remove( style.getId( ) );
     }
 
     private String getRandomName( )
@@ -100,8 +105,6 @@ private String getRandomName( )
     @Test
     public void testGetStylesManagement( ) throws AccessDeniedException
     {
-        System.out.println( "getStylesManagement" );
-
         MockHttpServletRequest request = new MockHttpServletRequest( );
         AdminUserUtils.registerAdminUserWithRigth( request, new AdminUser( ), StylesJspBean.RIGHT_MANAGE_STYLE );
 
@@ -132,7 +135,7 @@ public void testGetCreateStyle( ) throws AccessDeniedException
     public void testDoCreateStyle( ) throws AccessDeniedException
     {
         MockHttpServletRequest request = new MockHttpServletRequest( );
-        int nId = StyleHome.getStylesList( ).stream( ).map( Style::getId ).max( Integer::compare ).get( ) + 1;
+        int nId = _styleRepository.findAll( ).stream( ).map( Style::getId ).max( Integer::compare ).get( ) + 1;
         request.addParameter( Parameters.STYLE_ID, Integer.toString( nId ) );
         String name = getRandomName( );
         request.addParameter( Parameters.STYLE_NAME, name );
@@ -144,20 +147,21 @@ public void testDoCreateStyle( ) throws AccessDeniedException
             instance.doCreateStyle( request );
             AdminMessage message = AdminMessageService.getMessage( request );
             assertNull( message );
-            Style stored = StyleHome.findByPrimaryKey( nId );
+            Style stored = _styleRepository.load( nId ).get( );
             assertNotNull( stored );
             assertEquals( nId, stored.getId( ) );
         }
         finally
         {
-            StyleHome.remove( nId );
+            _styleRepository.remove( nId );
         }
     }
+
     @Test
     public void testDoCreateStyleInvalidToken( ) throws AccessDeniedException
     {
         MockHttpServletRequest request = new MockHttpServletRequest( );
-        int nId = StyleHome.getStylesList( ).stream( ).map( Style::getId ).max( Integer::compare ).get( ) + 1;
+        int nId = _styleRepository.findAll( ).stream( ).map( Style::getId ).max( Integer::compare ).get( ) + 1;
         request.addParameter( Parameters.STYLE_ID, Integer.toString( nId ) );
         String name = getRandomName( );
         request.addParameter( Parameters.STYLE_NAME, name );
@@ -172,19 +176,19 @@ public void testDoCreateStyleInvalidToken( ) throws AccessDeniedException
         }
         catch( AccessDeniedException e )
         {
-            Style stored = StyleHome.findByPrimaryKey( nId );
-            assertNull( stored );
+            assertThrows( NoSuchElementException.class, ( ) -> _styleRepository.load( nId ).get( ) );
         }
         finally
         {
-            StyleHome.remove( nId );
+            _styleRepository.remove( nId );
         }
     }
+
     @Test
     public void testDoCreateStyleNoToken( ) throws AccessDeniedException
     {
         MockHttpServletRequest request = new MockHttpServletRequest( );
-        int nId = StyleHome.getStylesList( ).stream( ).map( Style::getId ).max( Integer::compare ).get( ) + 1;
+        int nId = _styleRepository.findAll( ).stream( ).map( Style::getId ).max( Integer::compare ).get( ) + 1;
         request.addParameter( Parameters.STYLE_ID, Integer.toString( nId ) );
         String name = getRandomName( );
         request.addParameter( Parameters.STYLE_NAME, name );
@@ -197,12 +201,11 @@ public void testDoCreateStyleNoToken( ) throws AccessDeniedException
         }
         catch( AccessDeniedException e )
         {
-            Style stored = StyleHome.findByPrimaryKey( nId );
-            assertNull( stored );
+            assertThrows( NoSuchElementException.class, ( ) -> _styleRepository.load( nId ).get( ) );
         }
         finally
         {
-            StyleHome.remove( nId );
+            _styleRepository.remove( nId );
         }
     }
 
@@ -239,11 +242,12 @@ public void testDoModifyStyle( ) throws AccessDeniedException
         instance.doModifyStyle( request );
         AdminMessage message = AdminMessageService.getMessage( request );
         assertNull( message );
-        Style stored = StyleHome.findByPrimaryKey( style.getId( ) );
+        Style stored = _styleRepository.load( style.getId( ) ).get( );
         assertNotNull( stored );
         assertEquals( style.getId( ), stored.getId( ) );
         assertEquals( style.getDescription( ) + "_mod", stored.getDescription( ) );
     }
+
     @Test
     public void testDoModifyStyleInvalidToken( ) throws AccessDeniedException
     {
@@ -261,12 +265,13 @@ public void testDoModifyStyleInvalidToken( ) throws AccessDeniedException
         }
         catch( AccessDeniedException e )
         {
-            Style stored = StyleHome.findByPrimaryKey( style.getId( ) );
+            Style stored = _styleRepository.load( style.getId( ) ).get( );
             assertNotNull( stored );
             assertEquals( style.getId( ), stored.getId( ) );
             assertEquals( style.getDescription( ), stored.getDescription( ) );
         }
     }
+
     @Test
     public void testDoModifyStyleNoToken( ) throws AccessDeniedException
     {
@@ -282,7 +287,7 @@ public void testDoModifyStyleNoToken( ) throws AccessDeniedException
         }
         catch( AccessDeniedException e )
         {
-            Style stored = StyleHome.findByPrimaryKey( style.getId( ) );
+            Style stored = _styleRepository.load( style.getId( ) ).get( );
             assertNotNull( stored );
             assertEquals( style.getId( ), stored.getId( ) );
             assertEquals( style.getDescription( ), stored.getDescription( ) );
@@ -315,7 +320,7 @@ public void testGetConfirmRemoveStyleWithStyleSheet( ) throws AccessDeniedExcept
         stylesheet.setStyleId( style.getId( ) );
         stylesheet.setFile( "file" );
         stylesheet.setSource( "<a/>".getBytes( ) );
-        StyleSheetHome.create( stylesheet );
+        _styleSheetRepository.create( stylesheet );
         try
         {
             MockHttpServletRequest request = new MockHttpServletRequest( );
@@ -331,7 +336,7 @@ public void testGetConfirmRemoveStyleWithStyleSheet( ) throws AccessDeniedExcept
         }
         finally
         {
-            StyleSheetHome.remove( stylesheet.getId( ) );
+            _styleSheetRepository.remove( stylesheet.getId( ) );
         }
     }
 
@@ -348,8 +353,9 @@ public void testDoRemoveStyle( ) throws AccessDeniedException
         request.addParameter( SecurityTokenService.PARAMETER_TOKEN,
                 _securityTokenService.getToken( request, "jsp/admin/style/DoRemoveStyle.jsp" ) );
         instance.doRemoveStyle( request );
-        assertNull( StyleHome.findByPrimaryKey( style.getId( ) ) );
+        assertThrows( NoSuchElementException.class, ( ) -> _styleRepository.load( style.getId( ) ).get( ) );
     }
+
     @Test
     public void testDoRemoveStyleInvalidToken( ) throws AccessDeniedException
     {
@@ -364,9 +370,10 @@ public void testDoRemoveStyleInvalidToken( ) throws AccessDeniedException
         }
         catch( AccessDeniedException e )
         {
-            assertNotNull( StyleHome.findByPrimaryKey( style.getId( ) ) );
+            assertNotNull( _styleRepository.load( style.getId( ) ).get( ) );
         }
     }
+
     @Test
     public void testDoRemoveStyleNoToken( ) throws AccessDeniedException
     {
@@ -379,7 +386,7 @@ public void testDoRemoveStyleNoToken( ) throws AccessDeniedException
         }
         catch( AccessDeniedException e )
         {
-            assertNotNull( StyleHome.findByPrimaryKey( style.getId( ) ) );
+            assertNotNull( _styleRepository.load( style.getId( ) ).get( ) );
         }
     }
 }
diff --git a/src/test/java/fr/paris/lutece/portal/web/stylesheet/StyleSheetJspBeanTest.java b/src/test/java/fr/paris/lutece/portal/web/stylesheet/StyleSheetJspBeanTest.java
index 7e8da852d..fa047d546 100755
--- a/src/test/java/fr/paris/lutece/portal/web/stylesheet/StyleSheetJspBeanTest.java
+++ b/src/test/java/fr/paris/lutece/portal/web/stylesheet/StyleSheetJspBeanTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2022, City of Paris
+ * Copyright (c) 2002-2025, City of Paris
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40,6 +40,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.Random;
 
 import org.apache.commons.lang3.StringUtils;
@@ -47,10 +48,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import fr.paris.lutece.portal.business.style.IStyleRepository;
 import fr.paris.lutece.portal.business.style.Style;
-import fr.paris.lutece.portal.business.style.StyleHome;
+import fr.paris.lutece.portal.business.stylesheet.IStyleSheetRepository;
 import fr.paris.lutece.portal.business.stylesheet.StyleSheet;
-import fr.paris.lutece.portal.business.stylesheet.StyleSheetHome;
 import fr.paris.lutece.portal.business.user.AdminUser;
 import fr.paris.lutece.portal.service.admin.AccessDeniedException;
 import fr.paris.lutece.portal.service.message.AdminMessage;
@@ -79,30 +80,34 @@ public class StyleSheetJspBeanTest extends LuteceTestCase
     private StyleSheet stylesheet;
     @Inject
     private ISecurityTokenService _securityTokenService;
+    @Inject
+    private IStyleSheetRepository _styleSheetRepository;
+    @Inject
+    private IStyleRepository _styleRepository;
 
     @BeforeEach
     protected void setUp( ) throws Exception
     {
         style = new Style( );
-        int nId = StyleHome.getStylesList( ).stream( ).map( Style::getId ).max( Integer::compare ).get( ) + 1;
+        int nId = _styleRepository.findAll( ).stream( ).map( Style::getId ).max( Integer::compare ).get( ) + 1;
         style.setId( nId );
         style.setDescription( getRandomName( ) );
         style.setPortalComponentId( 2 );
-        StyleHome.create( style );
+        _styleRepository.create( style );
         stylesheet = new StyleSheet( );
         stylesheet.setDescription( getRandomName( ) );
         stylesheet.setModeId( 1 );
         stylesheet.setStyleId( style.getId( ) );
         stylesheet.setFile( "file" );
         stylesheet.setSource( "<a/>".getBytes( ) );
-        StyleSheetHome.create( stylesheet );
+        _styleSheetRepository.create( stylesheet );
     }
 
     @AfterEach
     protected void tearDown( ) throws Exception
     {
-        StyleSheetHome.remove( stylesheet.getId( ) );
-        StyleHome.remove( style.getId( ) );
+        _styleSheetRepository.remove( stylesheet.getId( ) );
+        _styleRepository.remove( style.getId( ) );
     }
 
     private String getRandomName( )
@@ -174,12 +179,12 @@ public void testDoCreateStyleSheet( ) throws IOException, AccessDeniedException
         try
         {
             instance.doCreateStyleSheet( multipart );
-            assertTrue( StyleSheetHome.getStyleSheetList( 0 ).stream( ).anyMatch( stylesheet -> stylesheet.getDescription( ).equals( randomName ) ) );
+            assertTrue( _styleSheetRepository.findByMode( 0 ).stream( ).anyMatch( stylesheet -> stylesheet.getDescription( ).equals( randomName ) ) );
         }
         finally
         {
-            StyleSheetHome.getStyleSheetList( 0 ).stream( ).filter( stylesheet -> stylesheet.getDescription( ).equals( randomName ) )
-                    .forEach( stylesheet -> StyleSheetHome.remove( stylesheet.getId( ) ) );
+            _styleSheetRepository.findByMode( 0 ).stream( ).filter( stylesheet -> stylesheet.getDescription( ).equals( randomName ) )
+                    .forEach( stylesheet -> _styleSheetRepository.remove( stylesheet.getId( ) ) );
         }
     }
     @Test
@@ -214,12 +219,12 @@ public void testDoCreateStyleSheetInvalidToken( ) throws IOException, AccessDeni
         }
         catch( AccessDeniedException e )
         {
-            assertTrue( StyleSheetHome.getStyleSheetList( 0 ).stream( ).noneMatch( stylesheet -> stylesheet.getDescription( ).equals( randomName ) ) );
+            assertTrue( _styleSheetRepository.findByMode( 0 ).stream( ).noneMatch( stylesheet -> stylesheet.getDescription( ).equals( randomName ) ) );
         }
         finally
         {
-            StyleSheetHome.getStyleSheetList( 0 ).stream( ).filter( stylesheet -> stylesheet.getDescription( ).equals( randomName ) )
-                    .forEach( stylesheet -> StyleSheetHome.remove( stylesheet.getId( ) ) );
+            _styleSheetRepository.findByMode( 0 ).stream( ).filter( stylesheet -> stylesheet.getDescription( ).equals( randomName ) )
+                    .forEach( stylesheet -> _styleSheetRepository.remove( stylesheet.getId( ) ) );
         }
     }
     @Test
@@ -251,12 +256,12 @@ public void testDoCreateStyleSheetNoToken( ) throws IOException, AccessDeniedExc
         }
         catch( AccessDeniedException e )
         {
-            assertTrue( StyleSheetHome.getStyleSheetList( 0 ).stream( ).noneMatch( stylesheet -> stylesheet.getDescription( ).equals( randomName ) ) );
+            assertTrue( _styleSheetRepository.findByMode( 0 ).stream( ).noneMatch( stylesheet -> stylesheet.getDescription( ).equals( randomName ) ) );
         }
         finally
         {
-            StyleSheetHome.getStyleSheetList( 0 ).stream( ).filter( stylesheet -> stylesheet.getDescription( ).equals( randomName ) )
-                    .forEach( stylesheet -> StyleSheetHome.remove( stylesheet.getId( ) ) );
+            _styleSheetRepository.findByMode( 0 ).stream( ).filter( stylesheet -> stylesheet.getDescription( ).equals( randomName ) )
+                    .forEach( stylesheet -> _styleSheetRepository.remove( stylesheet.getId( ) ) );
         }
     }
 
@@ -311,7 +316,7 @@ public void testDoModifyStyleSheet( ) throws AccessDeniedException, IOException
         instance.doModifyStyleSheet( multipart );
         AdminMessage message = AdminMessageService.getMessage( request );
         assertNull( message );
-        StyleSheet stored = StyleSheetHome.findByPrimaryKey( stylesheet.getId( ) );
+        StyleSheet stored = _styleSheetRepository.load( stylesheet.getId( ) ).get( );
         assertNotNull( stored );
         assertEquals( stylesheet.getDescription( ) + "_mod", stored.getDescription( ) );
     }
@@ -349,7 +354,7 @@ public void testDoModifyStyleSheetInvalidToken( ) throws AccessDeniedException,
         }
         catch( AccessDeniedException e )
         {
-            StyleSheet stored = StyleSheetHome.findByPrimaryKey( stylesheet.getId( ) );
+            StyleSheet stored = _styleSheetRepository.load( stylesheet.getId( ) ).get( );
             assertNotNull( stored );
             assertEquals( stylesheet.getDescription( ), stored.getDescription( ) );
         }
@@ -385,7 +390,7 @@ public void testDoModifyStyleSheetNoToken( ) throws AccessDeniedException, IOExc
         }
         catch( AccessDeniedException e )
         {
-            StyleSheet stored = StyleSheetHome.findByPrimaryKey( stylesheet.getId( ) );
+            StyleSheet stored = _styleSheetRepository.load( stylesheet.getId( ) ).get( );
             assertNotNull( stored );
             assertEquals( stylesheet.getDescription( ), stored.getDescription( ) );
         }
@@ -424,7 +429,7 @@ public void testDoRemoveStyleSheet( ) throws AccessDeniedException
                 _securityTokenService.getToken( request, "jsp/admin/style/DoRemoveStyleSheet.jsp" ) );
 
         instance.doRemoveStyleSheet( request );
-        assertNull( StyleSheetHome.findByPrimaryKey( stylesheet.getId( ) ) );
+        assertThrows( NoSuchElementException.class, ( ) -> _styleSheetRepository.load( stylesheet.getId( ) ).get( ) );
     }
     @Test
     public void testDoRemoveStyleSheetInvalidToken( ) throws AccessDeniedException
@@ -442,7 +447,7 @@ public void testDoRemoveStyleSheetInvalidToken( ) throws AccessDeniedException
         }
         catch( AccessDeniedException e )
         {
-            StyleSheet stored = StyleSheetHome.findByPrimaryKey( stylesheet.getId( ) );
+            StyleSheet stored = _styleSheetRepository.load( stylesheet.getId( ) ).get( );
             assertNotNull( stored );
             assertEquals( stylesheet.getId( ), stored.getId( ) );
         }
@@ -461,7 +466,7 @@ public void testDoRemoveStyleSheetNoToken( ) throws AccessDeniedException
         }
         catch( AccessDeniedException e )
         {
-            StyleSheet stored = StyleSheetHome.findByPrimaryKey( stylesheet.getId( ) );
+            StyleSheet stored = _styleSheetRepository.load( stylesheet.getId( ) ).get( );
             assertNotNull( stored );
             assertEquals( stylesheet.getId( ), stored.getId( ) );
         }
diff --git a/src/test/java/fr/paris/lutece/portal/web/xpages/SiteMapAppCycleTest.java b/src/test/java/fr/paris/lutece/portal/web/xpages/SiteMapAppCycleTest.java
index 503c4c1ea..e0d66db9c 100644
--- a/src/test/java/fr/paris/lutece/portal/web/xpages/SiteMapAppCycleTest.java
+++ b/src/test/java/fr/paris/lutece/portal/web/xpages/SiteMapAppCycleTest.java
@@ -41,7 +41,7 @@
 import org.junit.jupiter.api.Test;
 
 import fr.paris.lutece.portal.business.page.Page;
-import fr.paris.lutece.portal.business.style.PageTemplateHome;
+import fr.paris.lutece.portal.business.style.IPageTemplateRepository;
 import fr.paris.lutece.portal.service.page.IPageService;
 import fr.paris.lutece.portal.service.portal.PortalService;
 import fr.paris.lutece.portal.service.util.AppLogService;
@@ -63,6 +63,8 @@ public class SiteMapAppCycleTest extends LuteceTestCase
     private IPageService _pageService;
     @Inject
     private SiteMapApp _app;
+    @Inject
+    private IPageTemplateRepository _pageTemplateRepository;
     
     @BeforeEach
     protected void setUp( ) throws Exception
@@ -86,7 +88,7 @@ private Page getPage( Integer parentId )
         {
             page.setParentPageId( parentId );
         }
-        page.setPageTemplateId( PageTemplateHome.getPageTemplatesList( ).get( 0 ).getId( ) );
+        page.setPageTemplateId( _pageTemplateRepository.findAll( ).stream( ).findFirst( ).get( ).getId( ) );
         page.setName( "page" + new SecureRandom( ).nextLong( ) );
 
         _pageService.createPage( page );
diff --git a/src/test/java/fr/paris/lutece/portal/web/xpages/SiteMapAppTest.java b/src/test/java/fr/paris/lutece/portal/web/xpages/SiteMapAppTest.java
index 532fbb5c4..d5fa1a879 100644
--- a/src/test/java/fr/paris/lutece/portal/web/xpages/SiteMapAppTest.java
+++ b/src/test/java/fr/paris/lutece/portal/web/xpages/SiteMapAppTest.java
@@ -33,22 +33,16 @@
  */
 package fr.paris.lutece.portal.web.xpages;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.security.SecureRandom;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Properties;
 import java.util.Random;
 
 import org.junit.jupiter.api.Test;
 
 import fr.paris.lutece.portal.business.page.Page;
-import fr.paris.lutece.portal.business.style.PageTemplateHome;
+import fr.paris.lutece.portal.business.style.IPageTemplateRepository;
 import fr.paris.lutece.portal.service.cache.CacheService;
 import fr.paris.lutece.portal.service.cache.CacheableService;
 import fr.paris.lutece.portal.service.init.LuteceInitException;
@@ -60,7 +54,6 @@
 import fr.paris.lutece.portal.service.security.SecurityService;
 import fr.paris.lutece.test.LuteceTestCase;
 import fr.paris.lutece.test.mocks.MockHttpServletRequest;
-import fr.paris.lutece.util.AppInitPropertiesService;
 import jakarta.enterprise.inject.spi.CDI;
 import jakarta.inject.Inject;
 import jakarta.servlet.http.HttpServletRequest;
@@ -73,7 +66,10 @@ public class SiteMapAppTest extends LuteceTestCase
     private static final String ROLE1 = "ROLE1";
     private static final String ROLE2 = "ROLE2";
     private static final String SERVICE_NAME = "SiteMapService";
-    private @Inject IPageService pageService;
+    @Inject
+    private IPageService pageService;
+    @Inject
+    private IPageTemplateRepository _pageTemplateRepository;
 
     /**
      * Test of getPage method, of class fr.paris.lutece.portal.web.xpages.SiteMapApp.
@@ -108,7 +104,7 @@ public void testGetPageMod( )
         // create the page
         Page page = new Page( );
         page.setParentPageId( PortalService.getRootPageId( ) );
-        page.setPageTemplateId( PageTemplateHome.getPageTemplatesList( ).get( 0 ).getId( ) );
+        page.setPageTemplateId( _pageTemplateRepository.findAll( ).stream( ).findFirst( ).get( ).getId( ) );
         page.setName( randomPageName );
 
         pageService.createPage( page );
@@ -283,7 +279,7 @@ private Page createPage( String pageName, String role )
         Page page = new Page( );
         page.setParentPageId( PortalService.getRootPageId( ) );
         page.setName( pageName );
-        page.setPageTemplateId( PageTemplateHome.getPageTemplatesList( ).get( 0 ).getId( ) );
+        page.setPageTemplateId( _pageTemplateRepository.findAll( ).stream( ).findFirst( ).get( ).getId( ) );
 
         if ( role != null )
         {