Project

General

Profile

« Previous | Next » 

Revision 47598

- Fixed duplicate dependncies
- Fixed an error in eligibility checking
- Fixed an error in account activation
- Organized imports

View differences:

UserDAO.java
1 1
package eu.dnetlib.goldoa.service.dao;
2 2

  
3
import eu.dnetlib.goldoa.domain.*;
4

  
3
import eu.dnetlib.goldoa.domain.AccountAction;
4
import eu.dnetlib.goldoa.domain.Role;
5
import eu.dnetlib.goldoa.domain.User;
6
import eu.dnetlib.goldoa.domain.UserRole;
5 7
import org.apache.commons.codec.digest.DigestUtils;
6 8
import org.apache.commons.logging.Log;
7 9
import org.apache.commons.logging.LogFactory;
8
import org.hibernate.CacheMode;
9 10
import org.hibernate.Criteria;
10 11
import org.hibernate.criterion.Order;
11 12
import org.hibernate.criterion.ProjectionList;
12 13
import org.hibernate.criterion.Projections;
13 14
import org.hibernate.criterion.Restrictions;
14
import org.hibernate.transform.AliasToBeanResultTransformer;
15 15
import org.hibernate.transform.Transformers;
16 16
import org.springframework.stereotype.Repository;
17 17

  
18
import javax.persistence.Query;
19 18
import java.math.BigInteger;
20 19
import java.sql.Timestamp;
21
import java.util.ArrayList;
22 20
import java.util.List;
23 21

  
24 22
/**

Also available in: Unified diff