LUT-30030 : Migration of the unit tree plugin to Lutèce 8

Author: jlalouf-eviden

pom.xml

@@ -3,14 +3,14 @@
     <parent>
         <artifactId>lutece-global-pom</artifactId>
         <groupId>fr.paris.lutece.tools</groupId>
-        <version>7.0.1</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>fr.paris.lutece.plugins</groupId>
     <artifactId>plugin-unittree</artifactId>
     <packaging>lutece-plugin</packaging>
-    <version>3.1.2-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <name>Lutece unittree plugin</name>
 
     <repositories>
@@ -36,10 +36,22 @@
         <dependency>
             <groupId>fr.paris.lutece</groupId>
             <artifactId>lutece-core</artifactId>
-            <version>[7.0.0,)</version>
+            <version>[8.0.0-SNAPSHOT,)</version>
             <type>lutece-core</type>
         </dependency>
-    </dependencies>
+        <!-- JUnit -->
+        <dependency>
+            <groupId>fr.paris.lutece.plugins</groupId>
+            <artifactId>library-lutece-unit-testing</artifactId>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+			<groupId>org.glassfish.jaxb</groupId>
+	        <artifactId>jaxb-runtime</artifactId>
+	        <scope>test</scope>  
+		</dependency>
+</dependencies>
 
     <properties>
         <componentName>unittree</componentName>

src/java/fr/paris/lutece/plugins/unittree/business/action/ActionDAO.java

@@ -39,13 +39,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 /**
  *
  * ActionDAO
  *
  */
+@ApplicationScoped
 public class ActionDAO implements IActionDAO
 {
     private static final String SQL_QUERY_SELECT_ACTIONS = "SELECT id_action, name_key, description_key, action_url, icon_url, action_permission, action_type "

src/java/fr/paris/lutece/plugins/unittree/business/action/ActionFactory.java

@@ -33,13 +33,10 @@
  */
 package fr.paris.lutece.plugins.unittree.business.action;
 
-import fr.paris.lutece.portal.service.spring.SpringContextService;
 import fr.paris.lutece.portal.service.util.AppLogService;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.springframework.beans.factory.CannotLoadBeanClassException;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.literal.NamedLiteral;
+import jakarta.enterprise.inject.spi.CDI;
 
 /**
  *
@@ -49,6 +46,7 @@
  * </ul>
  *
  */
+@ApplicationScoped
 public class ActionFactory implements IActionFactory
 {
     /**
@@ -61,11 +59,11 @@ public IAction newAction( String strActionType )
 
         try
         {
-            action = SpringContextService.getBean( strActionType );
+            action = CDI.current( ).select( IAction.class ).select( NamedLiteral.of( strActionType ) ).get( );
         }
-        catch( BeansException e )
+        catch( Exception e )
         {
-            logBeanException( e );
+        	AppLogService.debug( "ActionFactory ERROR : could not load {} action - CAUSE : {}", strActionType, e.getMessage( ) );
         }
 
         // If no action is defined for strActionType, then create a DefaultAction
@@ -76,30 +74,4 @@ public IAction newAction( String strActionType )
 
         return action;
     }
-
-    private void logBeanException( BeansException e )
-    {
-        String beanName = null;
-        String message = e.getMessage( );
-
-        if ( e instanceof BeanDefinitionStoreException )
-        {
-            beanName = ( (BeanDefinitionStoreException) e ).getBeanName( );
-        }
-        else
-            if ( e instanceof NoSuchBeanDefinitionException )
-            {
-                beanName = ( (NoSuchBeanDefinitionException) e ).getBeanName( );
-            }
-            else
-                if ( e instanceof CannotLoadBeanClassException )
-                {
-                    beanName = ( (CannotLoadBeanClassException) e ).getBeanName( );
-                }
-
-        if ( beanName != null )
-        {
-            AppLogService.debug( "ActionFactory ERROR : could not load bean '" + beanName + "' - CAUSE : " + message );
-        }
-    }
-}
+}

src/java/fr/paris/lutece/plugins/unittree/business/action/ActionHome.java

@@ -36,7 +36,7 @@
 import fr.paris.lutece.plugins.unittree.service.UnitTreePlugin;
 import fr.paris.lutece.portal.service.plugin.Plugin;
 import fr.paris.lutece.portal.service.plugin.PluginService;
-import fr.paris.lutece.portal.service.spring.SpringContextService;
+import jakarta.enterprise.inject.spi.CDI;
 
 import java.util.List;
 
@@ -47,9 +47,8 @@
  */
 public final class ActionHome
 {
-    private static final String BEAN_ACTION_DAO = "unittree.actionDAO";
     private static Plugin _plugin = PluginService.getPlugin( UnitTreePlugin.PLUGIN_NAME );
-    private static IActionDAO _dao = SpringContextService.getBean( BEAN_ACTION_DAO );
+    private static IActionDAO _dao = CDI.current( ).select( IActionDAO.class ).get( );
 
     /**
      * Private constructor - this class need not be instantiated

src/java/fr/paris/lutece/plugins/unittree/business/action/UnitAction.java

@@ -33,11 +33,16 @@
  */
 package fr.paris.lutece.plugins.unittree.business.action;
 
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Named;
+
 /**
  *
  * This class represents the action usable on an unit
  *
  */
+@Dependent
+@Named( UnitAction.ACTION_TYPE )
 public class UnitAction extends AbstractAction
 {
     public static final String ACTION_TYPE = "unittree.unitAction";

src/java/fr/paris/lutece/plugins/unittree/business/action/UnitUserAction.java

@@ -33,11 +33,16 @@
  */
 package fr.paris.lutece.plugins.unittree.business.action;
 
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Named;
+
 /**
  *
  * This class represents an action usable on the user assigned to an unit
  *
  */
+@Dependent
+@Named( UnitUserAction.ACTION_TYPE )
 public class UnitUserAction extends AbstractAction
 {
     public static final String ACTION_TYPE = "unittree.unitUserAction";

src/java/fr/paris/lutece/plugins/unittree/business/assignment/UnitAssignmentDAO.java

@@ -36,6 +36,7 @@
 import fr.paris.lutece.plugins.unittree.business.unit.Unit;
 import fr.paris.lutece.portal.service.plugin.Plugin;
 import fr.paris.lutece.util.sql.DAOUtil;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import java.sql.Statement;
 import java.util.ArrayList;
@@ -44,7 +45,7 @@
 /**
  * This class provides Data Access methods for UnitAssignment objects
  */
-
+@ApplicationScoped
 public class UnitAssignmentDAO implements IUnitAssignmentDAO
 {
 

src/java/fr/paris/lutece/plugins/unittree/business/assignment/UnitAssignmentHome.java

@@ -38,7 +38,7 @@
 import fr.paris.lutece.plugins.unittree.service.UnitTreePlugin;
 import fr.paris.lutece.portal.service.plugin.Plugin;
 import fr.paris.lutece.portal.service.plugin.PluginService;
-import fr.paris.lutece.portal.service.spring.SpringContextService;
+import jakarta.enterprise.inject.spi.CDI;
 
 /**
  * This class provides instances management methods (create, find, ...) for UnitAssignment objects
@@ -49,7 +49,7 @@ public final class UnitAssignmentHome
     private static Plugin _plugin = PluginService.getPlugin( UnitTreePlugin.PLUGIN_NAME );
 
     // Static variable pointed at the DAO instance
-    private static IUnitAssignmentDAO _dao = SpringContextService.getBean( UnitAssignmentDAO.BEAN_NAME );
+    private static IUnitAssignmentDAO _dao = CDI.current( ).select( IUnitAssignmentDAO.class ).get( );
 
     /**
      * Private constructor

src/java/fr/paris/lutece/plugins/unittree/business/unit/Unit.java

@@ -38,7 +38,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  *

src/java/fr/paris/lutece/plugins/unittree/business/unit/UnitDAO.java

@@ -35,6 +35,7 @@
 
 import fr.paris.lutece.portal.service.plugin.Plugin;
 import fr.paris.lutece.util.sql.DAOUtil;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,6 +45,7 @@
  * UnitDAO
  *
  */
+@ApplicationScoped
 public class UnitDAO implements IUnitDAO
 {
     private static final String SQL_WHERE = " WHERE ";

src/java/fr/paris/lutece/plugins/unittree/business/unit/UnitHome.java

@@ -36,7 +36,7 @@
 import fr.paris.lutece.plugins.unittree.service.UnitTreePlugin;
 import fr.paris.lutece.portal.service.plugin.Plugin;
 import fr.paris.lutece.portal.service.plugin.PluginService;
-import fr.paris.lutece.portal.service.spring.SpringContextService;
+import jakarta.enterprise.inject.spi.CDI;
 
 import java.util.HashSet;
 import java.util.List;
@@ -49,9 +49,8 @@
  */
 public final class UnitHome
 {
-    private static final String BEAN_UNIT_DAO = "unittree.unitDAO";
     private static Plugin _plugin = PluginService.getPlugin( UnitTreePlugin.PLUGIN_NAME );
-    private static IUnitDAO _dao = SpringContextService.getBean( BEAN_UNIT_DAO );
+    private static IUnitDAO _dao = CDI.current( ).select( IUnitDAO.class ).get( );
 
     /**
      * Private constructor

src/java/fr/paris/lutece/plugins/unittree/resources/unittree_messages.properties

@@ -129,6 +129,7 @@ moveSubTree.labelUnitToMove=Entity to move
 moveSubTree.labelNoSuUnit=No sub-entities
 moveSubTree.subTreeMoved=The entity has been successfully moved
 moveSubTree.cantMoveSubTreeToChild=An entity cannot be moved to one of its children!
+moveSubTree.NoParentEntitySelected=You must select a parent entity to be able to move this entity
 
 # moke unit removal listener
 moke.unit.removal.listener.error=An error occurred during the deletion of the entity

src/java/fr/paris/lutece/plugins/unittree/resources/unittree_messages_fr.properties

@@ -129,6 +129,7 @@ moveSubTree.labelUnitToMove=Entit\u00e9 \u00e0 d\u00e9placer
 moveSubTree.labelNoSuUnit=Aucune sous-entit\u00e9
 moveSubTree.subTreeMoved=L'entit\u00e9 a bien \u00e9t\u00e9 d\u00e9plac\u00e9e
 moveSubTree.cantMoveSubTreeToChild=Une entit\u00e9 ne peut pas \u00eatre deplac\u00e9e dans un de ses enfants !
+moveSubTree.NoParentEntitySelected=Vous devez s\u00e9lectionner une entit\u00e9 parente pour pouvoir d\u00e9placer cette entit\u00e9
 
 # moke unit removal listener
 moke.unit.removal.listener.error=Une erreur moke est survenue lors de la suppression de l'entit\u00e9

src/java/fr/paris/lutece/plugins/unittree/service/action/ActionService.java

@@ -38,6 +38,7 @@
 import fr.paris.lutece.portal.business.user.AdminUser;
 import fr.paris.lutece.portal.service.i18n.I18nService;
 import fr.paris.lutece.portal.service.rbac.RBACResource;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -49,6 +50,7 @@
  * ActionService
  *
  */
+@ApplicationScoped
 public class ActionService implements IActionService
 {
     /**

src/java/fr/paris/lutece/plugins/unittree/service/assignment/UnitAssignmentService.java

@@ -38,11 +38,10 @@
 
 import fr.paris.lutece.plugins.unittree.business.assignment.IUnitAssignmentDAO;
 import fr.paris.lutece.plugins.unittree.business.assignment.UnitAssignment;
-import fr.paris.lutece.plugins.unittree.business.assignment.UnitAssignmentDAO;
 import fr.paris.lutece.plugins.unittree.service.UnitTreePlugin;
 import fr.paris.lutece.portal.service.plugin.Plugin;
 import fr.paris.lutece.portal.service.plugin.PluginService;
-import fr.paris.lutece.portal.service.spring.SpringContextService;
+import jakarta.enterprise.inject.spi.CDI;
 
 /**
  * This class is the entry point for unit assignment. It provides methods for unit assignment.
@@ -53,7 +52,7 @@ public final class UnitAssignmentService
     private static final Plugin _plugin = PluginService.getPlugin( UnitTreePlugin.PLUGIN_NAME );
 
     // Static variable pointed at the DAO instance
-    private static IUnitAssignmentDAO _dao = SpringContextService.getBean( UnitAssignmentDAO.BEAN_NAME );
+    private static IUnitAssignmentDAO _dao = CDI.current( ).select( IUnitAssignmentDAO.class ).get( );
 
     /**
      * Constructor

src/java/fr/paris/lutece/plugins/unittree/service/selection/IConfigurationHandler.java

@@ -35,7 +35,7 @@
 
 import java.util.Locale;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import fr.paris.lutece.plugins.workflowcore.service.task.ITask;
 

src/java/fr/paris/lutece/plugins/unittree/service/selection/IParametrableConfigurationHandler.java

@@ -35,7 +35,7 @@
 
 import java.util.Locale;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import fr.paris.lutece.plugins.workflowcore.service.task.ITask;
 

src/java/fr/paris/lutece/plugins/unittree/service/selection/IParametrableUnitSelection.java

@@ -33,7 +33,7 @@
  */
 package fr.paris.lutece.plugins.unittree.service.selection;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import fr.paris.lutece.plugins.unittree.exception.AssignmentNotPossibleException;
 import fr.paris.lutece.plugins.workflowcore.service.task.ITask;

src/java/fr/paris/lutece/plugins/unittree/service/selection/IUnitSelection.java

@@ -33,7 +33,7 @@
  */
 package fr.paris.lutece.plugins.unittree.service.selection;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import fr.paris.lutece.plugins.unittree.exception.AssignmentNotPossibleException;
 import fr.paris.lutece.plugins.workflowcore.service.task.ITask;

src/java/fr/paris/lutece/plugins/unittree/service/unit/IUnitAttributeService.java

@@ -36,7 +36,7 @@
 import fr.paris.lutece.plugins.unittree.business.unit.Unit;
 import fr.paris.lutece.plugins.unittree.service.UnitErrorException;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  *