chore(merge): master into dev

bonitasoft · Oct 17, 2024 · f3ca16f · f3ca16f
2 parents 6bf7ee0 + d798016
commit f3ca16f
Show file tree

Hide file tree

Showing 35 changed files with 87 additions and 122 deletions.
diff --git a/bonita-integration-tests/bonita-query-tests/build.gradle b/bonita-integration-tests/bonita-query-tests/build.gradle
@@ -10,7 +10,6 @@ dependencies {
     testImplementation libs.springTest
     testImplementation libs.springJdbc
     testImplementation libs.springOrm
-    testImplementation libs.jakartaInjectApi
     testImplementation project(":bpm:bonita-server")
     testImplementation project(":bpm:bonita-common")
 

diff --git a/...a-query-tests/src/test/java/org/bonitasoft/engine/application/ApplicationQueriesTest.java b/...a-query-tests/src/test/java/org/bonitasoft/engine/application/ApplicationQueriesTest.java
@@ -28,8 +28,6 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
-
 import org.bonitasoft.engine.business.application.model.AbstractSApplication;
 import org.bonitasoft.engine.business.application.model.SApplication;
 import org.bonitasoft.engine.business.application.model.SApplicationMenu;
@@ -43,6 +41,7 @@
 import org.bonitasoft.engine.test.persistence.repository.ApplicationRepository;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -55,7 +54,7 @@
 @Transactional
 public class ApplicationQueriesTest {
 
-    @Inject
+    @Autowired
     private ApplicationRepository repository;
 
     @Test

diff --git a/...-query-tests/src/test/java/org/bonitasoft/engine/core/contract/data/ContractDataTest.java b/...-query-tests/src/test/java/org/bonitasoft/engine/core/contract/data/ContractDataTest.java
@@ -19,12 +19,11 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Inject;
-
 import org.bonitasoft.engine.test.persistence.jdbc.JdbcRowMapper;
 import org.bonitasoft.engine.test.persistence.repository.ContractDataRepository;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -38,9 +37,9 @@
 @Transactional
 public class ContractDataTest {
 
-    @Inject
+    @Autowired
     private ContractDataRepository repository;
-    @Inject
+    @Autowired
     private JdbcTemplate jdbcTemplate;
 
     @Test

diff --git a/...sts/bonita-query-tests/src/test/java/org/bonitasoft/engine/core/form/FormMappingTest.java b/...sts/bonita-query-tests/src/test/java/org/bonitasoft/engine/core/form/FormMappingTest.java
@@ -19,13 +19,12 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Inject;
-
 import org.bonitasoft.engine.page.SPageMapping;
 import org.bonitasoft.engine.test.persistence.jdbc.JdbcRowMapper;
 import org.bonitasoft.engine.test.persistence.repository.TestRepository;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -36,10 +35,10 @@
 @Transactional
 public class FormMappingTest {
 
-    @Inject
+    @Autowired
     TestRepository testRepository;
 
-    @Inject
+    @Autowired
     private JdbcTemplate jdbcTemplate;
 
     @Test

diff --git a/...sts/src/test/java/org/bonitasoft/engine/core/process/instance/model/ActorMappingTest.java b/...sts/src/test/java/org/bonitasoft/engine/core/process/instance/model/ActorMappingTest.java
@@ -23,14 +23,13 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.inject.Inject;
-
 import org.bonitasoft.engine.actor.mapping.model.SActor;
 import org.bonitasoft.engine.actor.mapping.model.SActorMember;
 import org.bonitasoft.engine.identity.model.SUser;
 import org.bonitasoft.engine.test.persistence.repository.UserMembershipRepository;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -43,7 +42,7 @@
 @Transactional
 public class ActorMappingTest {
 
-    @Inject
+    @Autowired
     private UserMembershipRepository repository;
 
     @Test

diff --git a/...t/java/org/bonitasoft/engine/core/process/instance/model/ArchiveFlowNodeInstanceTest.java b/...t/java/org/bonitasoft/engine/core/process/instance/model/ArchiveFlowNodeInstanceTest.java
@@ -18,8 +18,6 @@
 
 import java.util.Map;
 
-import javax.inject.Inject;
-
 import org.bonitasoft.engine.core.process.definition.model.SGatewayType;
 import org.bonitasoft.engine.core.process.instance.model.archive.SAAutomaticTaskInstance;
 import org.bonitasoft.engine.core.process.instance.model.archive.SACallActivityInstance;
@@ -36,6 +34,7 @@
 import org.bonitasoft.engine.test.persistence.repository.FlowNodeInstanceRepository;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -46,9 +45,9 @@
 @Transactional
 public class ArchiveFlowNodeInstanceTest {
 
-    @Inject
+    @Autowired
     private FlowNodeInstanceRepository repository;
-    @Inject
+    @Autowired
     private JdbcTemplate jdbcTemplate;
 
     @Test

diff --git a/.../org/bonitasoft/engine/core/process/instance/model/ArchiveProcessInstanceQueriesTest.java b/.../org/bonitasoft/engine/core/process/instance/model/ArchiveProcessInstanceQueriesTest.java
@@ -24,8 +24,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Inject;
-
 import org.bonitasoft.engine.core.process.instance.model.archive.SAProcessInstance;
 import org.bonitasoft.engine.core.process.instance.model.archive.business.data.SAFlowNodeSimpleRefBusinessDataInstance;
 import org.bonitasoft.engine.core.process.instance.model.archive.business.data.SAProcessMultiRefBusinessDataInstance;
@@ -35,6 +33,7 @@
 import org.bonitasoft.engine.test.persistence.repository.ProcessInstanceRepository;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -48,10 +47,10 @@ public class ArchiveProcessInstanceQueriesTest {
     private static final long PROCESS_INSTANCE_ID = 43578923425L;
     private static final long FLOW_NODE_INSTANCE_ID = 342678L;
 
-    @Inject
+    @Autowired
     private ProcessInstanceRepository repository;
 
-    @Inject
+    @Autowired
     private JdbcTemplate jdbcTemplate;
 
     @Test

diff --git a/.../src/test/java/org/bonitasoft/engine/core/process/instance/model/BPMEventQueriesTest.java b/.../src/test/java/org/bonitasoft/engine/core/process/instance/model/BPMEventQueriesTest.java
@@ -22,13 +22,12 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.inject.Inject;
-
 import org.bonitasoft.engine.core.process.instance.model.event.handling.SMessageInstance;
 import org.bonitasoft.engine.core.process.instance.model.event.handling.SWaitingEvent;
 import org.bonitasoft.engine.test.persistence.repository.BPMEventRepository;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -43,10 +42,10 @@ public class BPMEventQueriesTest {
 
     private static final int MORE_THAN_DEFAULT_PAGE_SIZE = 42;
 
-    @Inject
+    @Autowired
     private BPMEventRepository bPMEventRepository;
 
-    @Inject
+    @Autowired
     private JdbcTemplate jdbcTemplate;
 
     @Test

diff --git a/...y-tests/src/test/java/org/bonitasoft/engine/core/process/instance/model/CommentsTest.java b/...y-tests/src/test/java/org/bonitasoft/engine/core/process/instance/model/CommentsTest.java
@@ -20,8 +20,6 @@
 
 import java.util.Map;
 
-import javax.inject.Inject;
-
 import org.bonitasoft.engine.core.process.comment.model.SHumanComment;
 import org.bonitasoft.engine.core.process.comment.model.SSystemComment;
 import org.bonitasoft.engine.core.process.comment.model.archive.SAComment;
@@ -30,6 +28,7 @@
 import org.bonitasoft.engine.test.persistence.repository.CommentRepository;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -47,9 +46,9 @@ public class CommentsTest {
     private static final long JOHN_ID = 784L;
     private static final long PROCESS1_ID = 123L;
     private static final long PROCESS2_ID = 124L;
-    @Inject
+    @Autowired
     private CommentRepository repository;
-    @Inject
+    @Autowired
     private JdbcTemplate jdbcTemplate;
 
     //Those tests currently verify that the queries returning UserMemberships correctly retrieve the groupParentPath when building the Usermembership objects

diff --git a/.../java/org/bonitasoft/engine/core/process/instance/model/ConnectorInstanceQueriesTest.java b/.../java/org/bonitasoft/engine/core/process/instance/model/ConnectorInstanceQueriesTest.java
@@ -20,8 +20,6 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
-
 import org.assertj.core.api.Condition;
 import org.assertj.core.util.Lists;
 import org.bonitasoft.engine.bpm.connector.ConnectorState;
@@ -30,6 +28,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -43,10 +42,10 @@
 @Transactional
 public class ConnectorInstanceQueriesTest {
 
-    @Inject
+    @Autowired
     private ConnectorInstanceRepository repository;
 
-    @Inject
+    @Autowired
     private JdbcTemplate jdbcTemplate;
 
     private SAbstractConnectorInstance expectedConnector1;

diff --git a/...est/java/org/bonitasoft/engine/core/process/instance/model/CustomUserInfoQueriesTest.java b/...est/java/org/bonitasoft/engine/core/process/instance/model/CustomUserInfoQueriesTest.java
@@ -20,14 +20,13 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
-
 import org.bonitasoft.engine.identity.model.SCustomUserInfoDefinition;
 import org.bonitasoft.engine.identity.model.SUser;
 import org.bonitasoft.engine.test.persistence.repository.CustomUserInfoRepository;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -44,7 +43,7 @@ public class CustomUserInfoQueriesTest {
 
     private static final String SKILLS_NAME = "skills";
 
-    @Inject
+    @Autowired
     private CustomUserInfoRepository repository;
 
     private SUser user1;

diff --git a/...va/org/bonitasoft/engine/core/process/instance/model/EventTriggerInstanceQueriesTest.java b/...va/org/bonitasoft/engine/core/process/instance/model/EventTriggerInstanceQueriesTest.java
@@ -17,14 +17,13 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
-
 import org.bonitasoft.engine.core.process.instance.model.event.SIntermediateCatchEventInstance;
 import org.bonitasoft.engine.core.process.instance.model.event.trigger.STimerEventTriggerInstance;
 import org.bonitasoft.engine.test.persistence.builder.PersistentObjectBuilder;
 import org.bonitasoft.engine.test.persistence.repository.ProcessInstanceRepository;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,7 +33,7 @@
 @Transactional
 public class EventTriggerInstanceQueriesTest {
 
-    @Inject
+    @Autowired
     private ProcessInstanceRepository repository;
 
     @Test

diff --git a/...src/test/java/org/bonitasoft/engine/core/process/instance/model/FlowNodeInstanceTest.java b/...src/test/java/org/bonitasoft/engine/core/process/instance/model/FlowNodeInstanceTest.java
@@ -34,8 +34,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Inject;
-
 import org.bonitasoft.engine.actor.mapping.model.SActor;
 import org.bonitasoft.engine.core.process.definition.model.SProcessDefinitionDeployInfo;
 import org.bonitasoft.engine.core.process.instance.model.archive.SAFlowNodeInstance;
@@ -53,6 +51,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -81,10 +80,10 @@ public class FlowNodeInstanceTest {
 
     private static final long NORMAL_HUMAN_INSTANCE_ID = 743L;
 
-    @Inject
+    @Autowired
     private FlowNodeInstanceRepository repository;
 
-    @Inject
+    @Autowired
     private JdbcTemplate jdbcTemplate;
 
     @Before

diff --git a/.../java/org/bonitasoft/engine/core/process/instance/model/ProcessDefinitionQueriesTest.java b/.../java/org/bonitasoft/engine/core/process/instance/model/ProcessDefinitionQueriesTest.java
@@ -21,13 +21,12 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
-
 import org.bonitasoft.engine.actor.mapping.model.SActor;
 import org.bonitasoft.engine.identity.model.SUser;
 import org.bonitasoft.engine.test.persistence.repository.ProcessInstanceRepository;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,7 +38,7 @@ public class ProcessDefinitionQueriesTest {
 
     private static final long PROCESS_ID = 45354312L;
     private static final long ROLE_ID = 222222L;
-    @Inject
+    @Autowired
     private ProcessInstanceRepository repository;
     /*
      * Tests for queries:

diff --git a/...a/org/bonitasoft/engine/core/process/instance/model/ProcessDeploymentInfoQueriesTest.java b/...a/org/bonitasoft/engine/core/process/instance/model/ProcessDeploymentInfoQueriesTest.java
@@ -26,8 +26,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Inject;
-
 import org.bonitasoft.engine.actor.mapping.model.SActor;
 import org.bonitasoft.engine.core.process.definition.model.SProcessDefinitionDeployInfo;
 import org.bonitasoft.engine.core.process.definition.model.SProcessDefinitionDesignContent;
@@ -38,6 +36,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -80,9 +79,9 @@ public class ProcessDeploymentInfoQueriesTest {
 
     private static final long ROOT_PROCESS_INSTANCE_ID_NOT_SUPERVISED = 1269L;
 
-    @Inject
+    @Autowired
     private ProcessDeploymentInfoRepository repository;
-    @Inject
+    @Autowired
     private JdbcTemplate jdbcTemplate;
 
     @Before