Revision 49828
Added by Panagiotis Kanakakis over 6 years ago
| UserManagerImpl.java | ||
|---|---|---|
| 20 | 20 |
import java.util.UUID; |
| 21 | 21 |
import java.util.concurrent.ExecutorService; |
| 22 | 22 |
|
| 23 |
//import eu.dnetlib.goldoa.service.utils.EmailUtils; |
|
| 24 | 23 |
|
| 25 | 24 |
/** |
| 26 | 25 |
* Created by antleb on 3/4/15. |
| ... | ... | |
| 34 | 33 |
|
| 35 | 34 |
@Autowired |
| 36 | 35 |
private EmailUtils emailUtils; |
| 37 |
|
|
| 36 |
|
|
| 38 | 37 |
@Autowired |
| 39 | 38 |
ExecutorService executorService; |
| 40 | 39 |
|
| 41 | 40 |
private int tokenTTL = 30; |
| 42 | 41 |
|
| 43 |
private Log log = LogFactory.getLog(UserManagerImpl.class);
|
|
| 42 |
private Log LOGGER = LogFactory.getLog(UserManagerImpl.class);
|
|
| 44 | 43 |
|
| 45 | 44 |
public static int generateId(Affiliation affiliation) {
|
| 46 | 45 |
StringBuilder sb = new StringBuilder(); |
| ... | ... | |
| 158 | 157 |
} catch (PersonManagerException e) {
|
| 159 | 158 |
throw e; |
| 160 | 159 |
} catch (Exception e) {
|
| 161 |
log.error("Error logging in", e);
|
|
| 160 |
LOGGER.error("Error logging in", e);
|
|
| 162 | 161 |
} |
| 163 | 162 |
return null; |
| 164 | 163 |
} |
| ... | ... | |
| 309 | 308 |
return userDAO.getUserRoles(email); |
| 310 | 309 |
} |
| 311 | 310 |
|
| 311 |
@Override |
|
| 312 |
public User createInActiveResearcher(String firstname, String lastname, String email, Organization organization) throws OrganizationManagerException, PersonManagerException {
|
|
| 313 |
|
|
| 314 |
if(firstname == null || lastname == null || email == null) |
|
| 315 |
throw new PersonManagerException("Empty firstname or lastname or email");
|
|
| 316 |
return userDAO.createInActiveResearcher(firstname,lastname,email,organization); |
|
| 317 |
} |
|
| 318 |
|
|
| 312 | 319 |
} |
Also available in: Unified diff
1. Change log4j properties file.
2. Add method to create researcher from bulk import csv
3. Change csv handling on bulk import
4. Modify request unit test.