Skip to content

Commit

Permalink
feat: Cleanup Dependencies to rely on Spring Dependencies Tree - Meed…
Browse files Browse the repository at this point in the history
  • Loading branch information
boubaker committed Dec 29, 2023
1 parent b650754 commit dd6ffda
Show file tree
Hide file tree
Showing 22 changed files with 58 additions and 3,972 deletions.
2 changes: 1 addition & 1 deletion exo.core.component.database/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 5 additions & 1 deletion exo.core.component.organization.api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
74 changes: 0 additions & 74 deletions exo.core.component.organization.tests/pom.xml

This file was deleted.

Loading

0 comments on commit dd6ffda

Please sign in to comment.