diff --git a/component/service/src/main/java/org/exoplatform/social/rest/api/EntityBuilder.java b/component/service/src/main/java/org/exoplatform/social/rest/api/EntityBuilder.java index f8d677a4459..62fe5d76785 100644 --- a/component/service/src/main/java/org/exoplatform/social/rest/api/EntityBuilder.java +++ b/component/service/src/main/java/org/exoplatform/social/rest/api/EntityBuilder.java @@ -297,7 +297,7 @@ public static ProfileEntity buildEntityProfile(Profile profile, String expand) { return buildEntityProfile(profile, null, expand); } - public static ProfileEntity buildEntityProfile(Profile profile, String restPath, String expand) { + public static ProfileEntity buildEntityProfile(Profile profile, String restPath, String expand) { // NOSONAR ProfileEntity userEntity = new ProfileEntity(profile.getId()); userEntity.setHref(RestUtils.getRestUrl(USERS_TYPE, profile.getIdentity().getRemoteId(), restPath)); userEntity.setIdentity(RestUtils.getRestUrl(IDENTITIES_TYPE, profile.getIdentity().getId(), restPath)); @@ -318,19 +318,14 @@ public static ProfileEntity buildEntityProfile(Profile profile, String restPath, if (canViewProperties || isProfilePropertyVisible(Profile.FULL_NAME)) { userEntity.setFullname(profile.getFullName()); } - if (canViewProperties || isProfilePropertyVisible(Profile.GENDER)) { - userEntity.setGender(profile.getGender()); - } if (canViewProperties || isProfilePropertyVisible(Profile.POSITION)) { userEntity.setPosition(profile.getPosition()); } if (canViewProperties || isProfilePropertyVisible(Profile.EMAIL)) { userEntity.setEmail(profile.getEmail()); } - if (canViewProperties || isProfilePropertyVisible(Profile.ABOUT_ME)) { - userEntity.setAboutMe((String) profile.getProperty(Profile.ABOUT_ME)); - } + userEntity.setAboutMe((String) profile.getProperty(Profile.ABOUT_ME)); userEntity.setAvatar(profile.getAvatarUrl()); userEntity.setBanner(profile.getBannerUrl()); userEntity.setDefaultAvatar(profile.isDefaultAvatar()); @@ -367,9 +362,7 @@ public static ProfileEntity buildEntityProfile(Profile profile, String restPath, if (canViewProperties || isProfilePropertyVisible(Profile.CONTACT_URLS)) { buildUrlEntities(profile, userEntity); } - if (canViewProperties || isProfilePropertyVisible(Profile.EXPERIENCES)) { - buildExperienceEntities(profile, userEntity); - } + buildExperienceEntities(profile, userEntity); userEntity.setDeleted(profile.getIdentity().isDeleted()); userEntity.setEnabled(profile.getIdentity().isEnable()); if (profile.getProperty(Profile.EXTERNAL) != null) { diff --git a/component/service/src/main/java/org/exoplatform/social/rest/entity/ProfileEntity.java b/component/service/src/main/java/org/exoplatform/social/rest/entity/ProfileEntity.java index f39be572c4f..798a6660ea8 100644 --- a/component/service/src/main/java/org/exoplatform/social/rest/entity/ProfileEntity.java +++ b/component/service/src/main/java/org/exoplatform/social/rest/entity/ProfileEntity.java @@ -46,8 +46,6 @@ public class ProfileEntity extends BaseEntity { public static final String EMAIL = "email"; - public static final String GENDER = "gender"; - public static final String FULLNAME = "fullname"; public static final String LASTNAME = "lastname"; @@ -311,15 +309,6 @@ public String getFullname() { return getString(FULLNAME); } - public ProfileEntity setGender(String gender) { - setProperty(GENDER, gender); - return this; - } - - public String getGender() { - return getString(GENDER); - } - public ProfileEntity setEmail(String email) { setProperty(EMAIL, email); return this; @@ -607,8 +596,6 @@ public static String getFieldName(String name) { return Profile.FULL_NAME; } else if (StringUtils.equals(EMAIL, name)) { return Profile.EMAIL; - } else if (StringUtils.equals(GENDER, name)) { - return Profile.GENDER; } else if (StringUtils.equals(POSITION, name)) { return Profile.POSITION; } else if (StringUtils.equals(AVATAR, name)) { diff --git a/component/service/src/main/java/org/exoplatform/social/rest/impl/identity/IdentityRest.java b/component/service/src/main/java/org/exoplatform/social/rest/impl/identity/IdentityRest.java index fd9ce76c66f..811b40513cf 100644 --- a/component/service/src/main/java/org/exoplatform/social/rest/impl/identity/IdentityRest.java +++ b/component/service/src/main/java/org/exoplatform/social/rest/impl/identity/IdentityRest.java @@ -23,7 +23,6 @@ import java.util.Date; import java.util.List; import java.util.Objects; -import java.util.stream.Collectors; import javax.annotation.security.RolesAllowed; import javax.ws.rs.GET; @@ -59,7 +58,6 @@ import org.exoplatform.social.rest.entity.CollectionEntity; import org.exoplatform.social.rest.entity.DataEntity; import org.exoplatform.social.rest.entity.IdentityEntity; -import org.exoplatform.social.rest.entity.ProfileEntity; import org.exoplatform.social.service.rest.api.VersionResources; import io.swagger.v3.oas.annotations.Operation; @@ -82,9 +80,7 @@ public IdentityRest(IdentityManager identityManager, ProfilePropertyService prof this.identityManager = identityManager; this.profilePropertyService = profilePropertyService; } - /** - * {@inheritDoc} - */ + @GET @RolesAllowed("users") @Operation( @@ -105,7 +101,6 @@ public Response getIdentities(@Context UriInfo uriInfo, offset = offset > 0 ? offset : RestUtils.getOffset(uriInfo); limit = limit > 0 ? limit : RestUtils.getLimit(uriInfo); - IdentityManager identityManager = CommonsUtils.getService(IdentityManager.class); String providerId = (type != null && type.equals("space")) ? SpaceIdentityProvider.NAME : OrganizationIdentityProvider.NAME; ListAccess listAccess = identityManager.getIdentitiesByProfileFilter(providerId, new ProfileFilter(), true); Identity[] identities = listAccess.load(offset, limit); @@ -124,9 +119,6 @@ public Response getIdentities(@Context UriInfo uriInfo, } } - /** - * {@inheritDoc} - */ @GET @Path("{id}") @RolesAllowed("users") @@ -142,7 +134,7 @@ public Response getIdentities(@Context UriInfo uriInfo, public Response getIdentityById(@Context UriInfo uriInfo, @Context Request request, @Parameter(description = "Identity id which is a UUID such as 40487b7e7f00010104499b339f056aa4", required = true) @PathParam("id") String id, - @Parameter(description = "Asking for a full representation of a specific subresource if any", required = false) @QueryParam("expand") String expand) throws Exception { + @Parameter(description = "Asking for a full representation of a specific subresource if any", required = false) @QueryParam("expand") String expand) { Identity identity = identityManager.getIdentity(id); if (identity == null) { throw new WebApplicationException(Response.Status.UNAUTHORIZED); @@ -263,13 +255,6 @@ public Response getIdentityByProviderIdAndRemoteId(@Context UriInfo uriInfo, return builder.build(); } - /** - * - * @param uriInfo - * @param id - * @return - * @throws IOException - */ @GET @Path("{id}/avatar") @RolesAllowed("users") @@ -286,7 +271,7 @@ public Response getIdentityAvatarById(@Context UriInfo uriInfo, @Context Request request, @Parameter(description = "Identity id which is a UUID", required = true)@PathParam("id") String id) throws IOException { - Identity identity = identityManager.getIdentity(id, true); + Identity identity = identityManager.getIdentity(id); if (identity == null) { throw new WebApplicationException(Response.Status.NOT_FOUND); } @@ -319,13 +304,6 @@ public Response getIdentityAvatarById(@Context UriInfo uriInfo, return builder.cacheControl(cc).build(); } - /** - * - * @param uriInfo - * @param id - * @return - * @throws IOException - */ @GET @Path("{id}/banner") @RolesAllowed("users") @@ -342,7 +320,7 @@ public Response getIdentityBannerById(@Context UriInfo uriInfo, @Context Request request, @Parameter(description = "Identity id which is a UUID", required = true)@PathParam("id") String id) throws IOException { - Identity identity = identityManager.getIdentity(id, true); + Identity identity = identityManager.getIdentity(id); if (identity == null) { throw new WebApplicationException(Response.Status.NOT_FOUND); } @@ -374,31 +352,7 @@ public Response getIdentityBannerById(@Context UriInfo uriInfo, builder.cacheControl(cc); return builder.cacheControl(cc).build(); } - - private Profile fillProfileFromEntity(ProfileEntity model, Identity identity) { - Profile profile = identity.getProfile(); - setProperty(profile, Profile.FIRST_NAME, model.getFirstname()); - setProperty(profile, Profile.LAST_NAME, model.getLastname()); - setProperty(profile, Profile.EMAIL, model.getEmail()); - setProperty(profile, Profile.POSITION, model.getPosition()); - setProperty(profile, Profile.GENDER, model.getGender()); -// setProperty(profile, Profile.CONTACT_PHONES, model.getPhones()); -// setProperty(profile, Profile.CONTACT_IMS, model.getIMs()); -// setProperty(profile, Profile.CONTACT_URLS, model.getUrls()); - setProperty(profile, Profile.DELETED, model.getDeleted()); - return profile; - } - private Profile setProperty(Profile profile, String key, Object value) { - if (value != null) { - profile.setProperty(key, value); - } - return profile; - } - - /** - * {@inheritDoc} - */ @GET @Path("{id}/relationships") @RolesAllowed("users") @@ -419,13 +373,12 @@ public Response getRelationshipsOfIdentity(@Context UriInfo uriInfo, @Schema(defaultValue = "0") @QueryParam("offset") int offset, @Parameter(description = "Limit", required = false) @Schema(defaultValue = "20") @QueryParam("limit") int limit, - @Parameter(description = "Asking for a full representation of a specific subresource if any", required = false) @QueryParam("expand") String expand) throws Exception { + @Parameter(description = "Asking for a full representation of a specific subresource if any", required = false) @QueryParam("expand") String expand) { offset = offset > 0 ? offset : RestUtils.getOffset(uriInfo); limit = limit > 0 ? limit : RestUtils.getLimit(uriInfo); - IdentityManager identityManager = CommonsUtils.getService(IdentityManager.class); - Identity identity = identityManager.getIdentity(id, true); + Identity identity = identityManager.getIdentity(id); if (identity == null) { throw new WebApplicationException(Response.Status.NOT_FOUND); } @@ -433,7 +386,7 @@ public Response getRelationshipsOfIdentity(@Context UriInfo uriInfo, RelationshipManager relationshipManager = CommonsUtils.getService(RelationshipManager.class); if (with != null && with.length() > 0) { - Identity withUser = identityManager.getIdentity(with, true); + Identity withUser = identityManager.getIdentity(with); if (withUser == null) { throw new WebApplicationException(Response.Status.UNAUTHORIZED); } @@ -485,14 +438,14 @@ public Response getCommonConnectionsWithIdentity(@Context UriInfo uriInfo, List currentUserConnections = Arrays.asList(relationshipManager.getConnections(authenticatedUser).load(0, 0)); - Identity withIdentity = CommonsUtils.getService(IdentityManager.class).getIdentity(id, true); + Identity withIdentity = CommonsUtils.getService(IdentityManager.class).getIdentity(id); List withConnections = Arrays.asList(relationshipManager.getConnections(withIdentity).load(0, 0)); List commonConnections = currentUserConnections.stream() .filter(withConnections::contains) - .collect(Collectors.toList()); + .toList(); - List identityEntities = new ArrayList(); + List identityEntities = new ArrayList<>(); for (Identity identity : commonConnections) { identityEntities.add(EntityBuilder.buildEntityIdentity(identity, uriInfo.getPath(), expand).getDataEntity()); }