Merge Spring Integration - Meeds-io/MIPs#57 (#94)

Meeds-io · Jan 11, 2024 · 7ef6b08 · 7ef6b08
2 parents 445600a + 74e51ff
commit 7ef6b08
Show file tree

Hide file tree

Showing 22 changed files with 58 additions and 3,972 deletions.
diff --git a/exo.core.component.database/pom.xml b/exo.core.component.database/pom.xml
@@ -81,7 +81,7 @@
          <artifactId>jboss-logging</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.hibernate</groupId>
+         <groupId>org.hibernate.orm</groupId>
          <artifactId>hibernate-core</artifactId>
          <exclusions>
             <exclusion>

diff --git a/....component.database/src/main/java/org/exoplatform/services/database/DBObjectPageList.java b/....component.database/src/main/java/org/exoplatform/services/database/DBObjectPageList.java
@@ -18,15 +18,16 @@
  */
 package org.exoplatform.services.database;
 
-import org.exoplatform.commons.utils.PageList;
-import org.hibernate.Query;
-import org.hibernate.Session;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.hibernate.Session;
+import org.hibernate.query.Query;
+
+import org.exoplatform.commons.utils.PageList;
+
 /**
  * @author Tuan Nguyen ([email protected])
  * @since Oct 21, 2004

diff --git a/...t.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java b/...t.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java
@@ -150,15 +150,15 @@ final public void closeSession() {
   }
 
   public Object findExactOne(Session session, String query, String id) throws Exception {
-    Object res = session.createQuery(query).setString("id", id).uniqueResult();
+    Object res = session.createQuery(query).setParameter("id", id).uniqueResult();
     if (res == null) {
       throw new ObjectNotFoundException("Cannot find the object with id: " + id);
     }
     return res;
   }
 
   public Object findOne(Session session, String query, String id) throws Exception {
-    List<?> l = session.createQuery(query).setString("id", id).list();
+    List<?> l = session.createQuery(query).setParameter("id", id).list();
     if (l.size() == 0) {
       return null;
     } else if (l.size() > 1) {

diff --git a/exo.core.component.organization.api/pom.xml b/exo.core.component.organization.api/pom.xml
@@ -48,7 +48,11 @@
          <artifactId>exo.core.component.security.core</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.hibernate</groupId>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.hibernate.orm</groupId>
          <artifactId>hibernate-core</artifactId>
          <exclusions>
             <exclusion>

diff --git a/...va/org/exoplatform/services/organization/externalstore/IDMExternalStoreImportService.java b/...va/org/exoplatform/services/organization/externalstore/IDMExternalStoreImportService.java
@@ -4,7 +4,7 @@
 import java.util.*;
 import java.util.function.Consumer;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.exoplatform.commons.utils.PropertyManager;
 import org.exoplatform.services.organization.impl.UserImpl;
 import org.picocontainer.Startable;

diff --git a/...rc/main/java/org/exoplatform/services/organization/externalstore/model/IDMQueueEntry.java b/...rc/main/java/org/exoplatform/services/organization/externalstore/model/IDMQueueEntry.java
@@ -3,7 +3,7 @@
 import java.util.Calendar;
 import java.util.Objects;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * IDM Queue entry DTO

diff --git a/....organization.api/src/main/java/org/exoplatform/services/organization/impl/GroupImpl.java b/....organization.api/src/main/java/org/exoplatform/services/organization/impl/GroupImpl.java
@@ -26,12 +26,17 @@
 
 import java.util.Objects;
 
-import javax.persistence.*;
-
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
-import org.exoplatform.services.organization.*;
+import org.exoplatform.services.organization.ExtendedCloneable;
+import org.exoplatform.services.organization.Group;
+import org.exoplatform.services.organization.OrganizationService;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Entity
 @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)

diff --git a/...nization.api/src/main/java/org/exoplatform/services/organization/impl/MembershipImpl.java b/...nization.api/src/main/java/org/exoplatform/services/organization/impl/MembershipImpl.java
@@ -18,16 +18,18 @@
  */
 package org.exoplatform.services.organization.impl;
 
-import org.exoplatform.services.organization.ExtendedCloneable;
-import org.exoplatform.services.organization.Membership;
+import java.util.Objects;
+
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.util.Objects;
+import org.exoplatform.services.organization.ExtendedCloneable;
+import org.exoplatform.services.organization.Membership;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Entity
 @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)

diff --git a/...tion.api/src/main/java/org/exoplatform/services/organization/impl/MembershipTypeImpl.java b/...tion.api/src/main/java/org/exoplatform/services/organization/impl/MembershipTypeImpl.java
@@ -18,17 +18,19 @@
  */
 package org.exoplatform.services.organization.impl;
 
-import org.exoplatform.services.organization.ExtendedCloneable;
-import org.exoplatform.services.organization.MembershipType;
+import java.util.Date;
+import java.util.Objects;
+
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.util.Date;
-import java.util.Objects;
+import org.exoplatform.services.organization.ExtendedCloneable;
+import org.exoplatform.services.organization.MembershipType;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 /**
  * Created by The eXo Platform SAS .

diff --git a/...t.organization.api/src/main/java/org/exoplatform/services/organization/impl/UserImpl.java b/...t.organization.api/src/main/java/org/exoplatform/services/organization/impl/UserImpl.java
@@ -18,17 +18,20 @@
  */
 package org.exoplatform.services.organization.impl;
 
+import java.util.Date;
+import java.util.Objects;
+
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
-import org.exoplatform.services.organization.*;
+import org.exoplatform.services.organization.ExtendedCloneable;
+import org.exoplatform.services.organization.OrganizationService;
+import org.exoplatform.services.organization.User;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.util.Date;
-import java.util.Objects;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Entity
 @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)

diff --git a/exo.core.component.organization.tests/pom.xml b/exo.core.component.organization.tests/pom.xml