From 70f70c6ed3843aad30a233d61cbe2c0d08523a2a Mon Sep 17 00:00:00 2001 From: vjanakiram Date: Tue, 26 Nov 2024 17:26:44 +0530 Subject: [PATCH] Revert "Update the SiteMembership Class" This reverts commit 15045f961276298ca17fb78bdb2862c9f889b6cd. --- .../main/java/org/alfresco/repo/site/SiteMembership.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java b/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java index 07f1606342..02bd161f74 100644 --- a/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java +++ b/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java @@ -29,10 +29,10 @@ import org.alfresco.api.AlfrescoPublicApi; import org.alfresco.query.CannedQuerySortDetails; import org.alfresco.service.cmr.site.SiteInfo; import org.alfresco.util.Pair; -import org.apache.commons.lang.StringUtils; + import java.util.Comparator; import java.util.List; - +import java.util.Optional; /** * Conveys information for a member of a site. @@ -78,8 +78,7 @@ public class SiteMembership extends AbstractSiteMembership "FirstName required building site membership of " + siteInfo.getShortName()); } this.firstName = firstName; - // this.lastName = Optional.of(lastName).orElse(""); - this.lastName= StringUtils.isBlank(lastName) ? StringUtils.EMPTY : lastName; + this.lastName = Optional.ofNullable(lastName).orElse(""); this.isMemberOfGroup = isMemberOfGroup; }