inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3058 from Alfresco/fix/MNT-24571-Site-Membership-API

Browse Source 
Fix/MNT-24571-Site Membership API
This commit is contained in:
varapathijanakiram
2024-11-28 16:23:20 +05:30
committed by GitHub
parent c80e1fa94b d405043c5d
commit 53e8a06a6e
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
repository/src/main/java/org/alfresco/repo/site/SiteMembership.java
View File

@@ -2,7 +2,7 @@
* #%L * #%L
* Alfresco Repository * Alfresco Repository
* %% * %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited * Copyright (C) 2005 - 2024 Alfresco Software Limited
* %% * %%
* This file is part of the Alfresco software. * This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of * If the software was purchased under a paid Alfresco license, the terms of
@@ -25,14 +25,15 @@
*/ */
package org.alfresco.repo.site; package org.alfresco.repo.site;
import java.util.Comparator;
import java.util.List;
import java.util.Optional;
import org.alfresco.api.AlfrescoPublicApi; import org.alfresco.api.AlfrescoPublicApi;
import org.alfresco.query.CannedQuerySortDetails; import org.alfresco.query.CannedQuerySortDetails;
import org.alfresco.service.cmr.site.SiteInfo; import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.util.Pair; import org.alfresco.util.Pair;
import java.util.Comparator;
import java.util.List;
/** /**
* Conveys information for a member of a site. * Conveys information for a member of a site.
* *
@@ -52,7 +53,7 @@ public class SiteMembership extends AbstractSiteMembership
public SiteMembership(SiteInfo siteInfo, String id, String firstName, String lastName, public SiteMembership(SiteInfo siteInfo, String id, String firstName, String lastName,
String role) String role)
{ {
super(siteInfo,id, role); super(siteInfo, id, role);
if (firstName == null) if (firstName == null)
{ {
throw new java.lang.IllegalArgumentException( throw new java.lang.IllegalArgumentException(
@@ -76,13 +77,8 @@ public class SiteMembership extends AbstractSiteMembership
throw new java.lang.IllegalArgumentException( throw new java.lang.IllegalArgumentException(
"FirstName required building site membership of " + siteInfo.getShortName()); "FirstName required building site membership of " + siteInfo.getShortName());
} }
if (lastName == null)
{
throw new java.lang.IllegalArgumentException(
"LastName required building site membership of " + siteInfo.getShortName());
}
this.firstName = firstName; this.firstName = firstName;
this.lastName = lastName; this.lastName = Optional.ofNullable(lastName).orElse("");
this.isMemberOfGroup = isMemberOfGroup; this.isMemberOfGroup = isMemberOfGroup;
} }
@@ -164,7 +160,6 @@ public class SiteMembership extends AbstractSiteMembership
", isMemberOfGroup = " + isMemberOfGroup + "]"; ", isMemberOfGroup = " + isMemberOfGroup + "]";
} }
static int compareTo(List<Pair<? extends Object, CannedQuerySortDetails.SortOrder>> sortPairs, SiteMembership o1, SiteMembership o2) static int compareTo(List<Pair<? extends Object, CannedQuerySortDetails.SortOrder>> sortPairs, SiteMembership o1, SiteMembership o2)
{ {
String personId1 = o1.getPersonId(); String personId1 = o1.getPersonId();