Compare commits
No commits in common. "bug-27218" and "master" have entirely different histories.
|
@ -4,10 +4,6 @@
|
|||
All notable changes to this project will be documented in this file.
|
||||
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## [v2.5.5-SNAPSHOT] - 2024-04-16
|
||||
|
||||
- Bug #27218 fixed null pointer exception of parsing user from json
|
||||
|
||||
## [v2.5.4] - 2022-07-06
|
||||
|
||||
- Feature #23622 added Catalogue-Manager and Moderator roles
|
||||
|
|
2
pom.xml
2
pom.xml
|
@ -10,7 +10,7 @@
|
|||
</parent>
|
||||
<groupId>org.gcube.dvos</groupId>
|
||||
<artifactId>usermanagement-core</artifactId>
|
||||
<version>2.5.5-SNAPSHOT</version>
|
||||
<version>2.5.4</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>User Management API</name>
|
||||
|
|
|
@ -147,12 +147,8 @@ public class LiferayWSUserManager implements UserManager{
|
|||
private GCubeUser mapLRUser(String json){
|
||||
try{
|
||||
if (json != null) {
|
||||
logger.info("user json to be parsed: " + json);
|
||||
JSONParser parser = new JSONParser();
|
||||
JSONObject userJSON = (JSONObject)parser.parse(json);
|
||||
if(userJSON!=null){
|
||||
logger.info("parsed user json: " + userJSON.toString());
|
||||
}
|
||||
// TODO skip for now
|
||||
List<Email> emails = new ArrayList<Email>();
|
||||
// for (EmailAddress e : u.getEmailAddresses()) {
|
||||
|
@ -165,17 +161,15 @@ public class LiferayWSUserManager implements UserManager{
|
|||
} catch (Exception e1) {
|
||||
logger.warn("Failed to retrieve property " + USER_LOCATION_INDUSTRY_KEY, e1);
|
||||
}
|
||||
if(userJSON!=null){
|
||||
logger.info("parsed user json: " + userJSON.toString());
|
||||
}
|
||||
|
||||
// retrieve the contact id information (it is into the user json)
|
||||
String jsonContact;
|
||||
JSONObject contactJSON;
|
||||
try{
|
||||
long contactId = (long)userJSON.get("contactId");
|
||||
jsonContact = getContactJson(contactId);
|
||||
contactJSON = (JSONObject)parser.parse(jsonContact);
|
||||
return new GCubeUser(
|
||||
long contactId = (long)userJSON.get("contactId");
|
||||
|
||||
// retrieve contact json obj from contactId
|
||||
String jsonContact = getContactJson(contactId);
|
||||
JSONObject contactJSON = (JSONObject)parser.parse(jsonContact);
|
||||
|
||||
return new GCubeUser(
|
||||
(long)userJSON.get("userId"),
|
||||
(String)userJSON.get("screenName"),
|
||||
(String)userJSON.get("emailAddress"),
|
||||
|
@ -189,23 +183,6 @@ public class LiferayWSUserManager implements UserManager{
|
|||
(String)userJSON.get("jobTitle"),
|
||||
locationIndustry,
|
||||
emails);
|
||||
}catch (Exception e) {
|
||||
logger.warn("Failed to retrieve property " + "contactId", e);
|
||||
return new GCubeUser(
|
||||
(long)userJSON.get("userId"),
|
||||
(String)userJSON.get("screenName"),
|
||||
(String)userJSON.get("emailAddress"),
|
||||
(String)userJSON.get("firstName"),
|
||||
(String)userJSON.get("middleName"),
|
||||
(String)userJSON.get("lastName"),
|
||||
buildFullName(userJSON),
|
||||
(long)userJSON.get("createDate"),
|
||||
getUserAvatarAbsoluteURL((String)userJSON.get("uuid"), (long)userJSON.get("portraitId")), // skip for now TODO getUserAvatarAbsoluteURL(u)
|
||||
false,
|
||||
(String)userJSON.get("jobTitle"),
|
||||
locationIndustry,
|
||||
emails);
|
||||
}
|
||||
}
|
||||
}catch(Exception e){
|
||||
logger.error("Exception while mapping the json user object to the GCubeUser java object", e);
|
||||
|
@ -310,14 +287,10 @@ public class LiferayWSUserManager implements UserManager{
|
|||
@Override
|
||||
public GCubeUser getUserByUsername(String username)
|
||||
throws UserManagementSystemException, UserRetrievalFault {
|
||||
|
||||
logger.info("username: " + username);
|
||||
|
||||
|
||||
String jsonUser =
|
||||
HttpUtils.executeHTTPGETRequest(API_BASE_URL + GET_USER_BY_USERNAME.replace("$COMPANY_ID", String.valueOf(companyId)).replace("$USER_ID", username),
|
||||
credsProvider, localContext, target);
|
||||
logger.info("jsonUser: " + jsonUser);
|
||||
|
||||
if(jsonUser != null){
|
||||
logger.debug("Json user retrieved");
|
||||
|
|
Loading…
Reference in New Issue