From d4591acf2cce992f86de1130dd33fa85c693ac2f Mon Sep 17 00:00:00 2001 From: varapathijanakiram <172787912+varapathijanakiram@users.noreply.github.com> Date: Tue, 26 Nov 2024 16:31:47 +0530 Subject: [PATCH 01/13] Update the SiteMembership Class --- .../main/java/org/alfresco/repo/site/SiteMembership.java | 7 +------ 1 file changed, 1 insertion(+), 6 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 f8c4a68330..6c93cb6aea 100644 --- a/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java +++ b/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java @@ -76,13 +76,8 @@ public class SiteMembership extends AbstractSiteMembership throw new java.lang.IllegalArgumentException( "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.lastName = lastName; + this.lastName = Optional.ofNullable(lastName).orElse(""); this.isMemberOfGroup = isMemberOfGroup; } From b5e023950d05565f3f5156512863214c1b62c45c Mon Sep 17 00:00:00 2001 From: vjanakiram Date: Tue, 26 Nov 2024 16:48:11 +0530 Subject: [PATCH 02/13] Update the SiteMembership Class --- .../src/main/java/org/alfresco/repo/site/SiteMembership.java | 1 + 1 file changed, 1 insertion(+) 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 6c93cb6aea..02bd161f74 100644 --- a/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java +++ b/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java @@ -32,6 +32,7 @@ import org.alfresco.util.Pair; import java.util.Comparator; import java.util.List; +import java.util.Optional; /** * Conveys information for a member of a site. From 15045f961276298ca17fb78bdb2862c9f889b6cd Mon Sep 17 00:00:00 2001 From: vjanakiram Date: Tue, 26 Nov 2024 17:25:23 +0530 Subject: [PATCH 03/13] Update the SiteMembership Class --- .../main/java/org/alfresco/repo/site/SiteMembership.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 02bd161f74..07f1606342 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,7 +78,8 @@ public class SiteMembership extends AbstractSiteMembership "FirstName required building site membership of " + siteInfo.getShortName()); } this.firstName = firstName; - this.lastName = Optional.ofNullable(lastName).orElse(""); + // this.lastName = Optional.of(lastName).orElse(""); + this.lastName= StringUtils.isBlank(lastName) ? StringUtils.EMPTY : lastName; this.isMemberOfGroup = isMemberOfGroup; } From 70f70c6ed3843aad30a233d61cbe2c0d08523a2a Mon Sep 17 00:00:00 2001 From: vjanakiram Date: Tue, 26 Nov 2024 17:26:44 +0530 Subject: [PATCH 04/13] 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; } From e6f9d887790f4e646079efce585736e903fb337c Mon Sep 17 00:00:00 2001 From: vjanakiram Date: Tue, 26 Nov 2024 17:27:33 +0530 Subject: [PATCH 05/13] Update the SiteMembership Class --- .../main/java/org/alfresco/repo/site/SiteMembership.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 02bd161f74..07f1606342 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,7 +78,8 @@ public class SiteMembership extends AbstractSiteMembership "FirstName required building site membership of " + siteInfo.getShortName()); } this.firstName = firstName; - this.lastName = Optional.ofNullable(lastName).orElse(""); + // this.lastName = Optional.of(lastName).orElse(""); + this.lastName= StringUtils.isBlank(lastName) ? StringUtils.EMPTY : lastName; this.isMemberOfGroup = isMemberOfGroup; } From 39395af528982ad04678165c6b691c1cc565391d Mon Sep 17 00:00:00 2001 From: vjanakiram Date: Tue, 26 Nov 2024 17:49:12 +0530 Subject: [PATCH 06/13] Update the SiteMembership Class --- .../src/main/java/org/alfresco/repo/site/SiteMembership.java | 5 ++--- 1 file changed, 2 insertions(+), 3 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..203ac6d087 100644 --- a/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java +++ b/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java @@ -29,9 +29,9 @@ 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; /** @@ -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.of(lastName).orElse(""); this.isMemberOfGroup = isMemberOfGroup; } From ee8f3bec188b9e9973205cb72ebaecd4713b78f3 Mon Sep 17 00:00:00 2001 From: vjanakiram Date: Wed, 27 Nov 2024 10:47:56 +0530 Subject: [PATCH 07/13] Update the license i SiteMembership --- .../src/main/java/org/alfresco/repo/site/SiteMembership.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 203ac6d087..965f040e89 100644 --- a/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java +++ b/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of From ba5f5418abafe02be2f90cfdc2a5f3c4729f4b55 Mon Sep 17 00:00:00 2001 From: vjanakiram Date: Wed, 27 Nov 2024 10:58:40 +0530 Subject: [PATCH 08/13] Revert "Update the license i SiteMembership" This reverts commit ee8f3bec188b9e9973205cb72ebaecd4713b78f3. --- .../src/main/java/org/alfresco/repo/site/SiteMembership.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 965f040e89..203ac6d087 100644 --- a/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java +++ b/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2024 Alfresco Software Limited + * Copyright (C) 2005 - 2016 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of From 6b738342c16b65986cb7d0242c8a26c960e6a19c Mon Sep 17 00:00:00 2001 From: vjanakiram Date: Wed, 27 Nov 2024 10:59:13 +0530 Subject: [PATCH 09/13] Update the license SiteMembership --- .../src/main/java/org/alfresco/repo/site/SiteMembership.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 203ac6d087..ae857451da 100644 --- a/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java +++ b/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2014 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of From 2dcd2788b2e8d9707a4e718daec060e690a6a506 Mon Sep 17 00:00:00 2001 From: rrajoria <88024787+rrajoria@users.noreply.github.com> Date: Wed, 27 Nov 2024 11:02:51 +0530 Subject: [PATCH 10/13] Fix Precommit --- .../main/java/org/alfresco/repo/site/SiteMembership.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 ae857451da..2cea6657cb 100644 --- a/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java +++ b/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2014 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -53,7 +53,7 @@ public class SiteMembership extends AbstractSiteMembership public SiteMembership(SiteInfo siteInfo, String id, String firstName, String lastName, String role) { - super(siteInfo,id, role); + super(siteInfo, id, role); if (firstName == null) { throw new java.lang.IllegalArgumentException( @@ -78,7 +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 = Optional.of(lastName).orElse(""); this.isMemberOfGroup = isMemberOfGroup; } From a5e713c1762d3d6d7e68c76ff3e19bd7a667e92a Mon Sep 17 00:00:00 2001 From: rrajoria <88024787+rrajoria@users.noreply.github.com> Date: Wed, 27 Nov 2024 11:11:41 +0530 Subject: [PATCH 11/13] Fix Precommit --- .../src/main/java/org/alfresco/repo/site/SiteMembership.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 2cea6657cb..e8b7060c36 100644 --- a/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java +++ b/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java @@ -29,11 +29,11 @@ import org.alfresco.api.AlfrescoPublicApi; import org.alfresco.query.CannedQuerySortDetails; import org.alfresco.service.cmr.site.SiteInfo; import org.alfresco.util.Pair; + import java.util.Comparator; import java.util.List; import java.util.Optional; - /** * Conveys information for a member of a site. * @@ -160,7 +160,6 @@ public class SiteMembership extends AbstractSiteMembership ", isMemberOfGroup = " + isMemberOfGroup + "]"; } - static int compareTo(List> sortPairs, SiteMembership o1, SiteMembership o2) { String personId1 = o1.getPersonId(); From da50f6271c11181777c4c6ea98c5f1ba8b5a0d69 Mon Sep 17 00:00:00 2001 From: rrajoria <88024787+rrajoria@users.noreply.github.com> Date: Wed, 27 Nov 2024 11:20:04 +0530 Subject: [PATCH 12/13] Fix Precommit --- .../main/java/org/alfresco/repo/site/SiteMembership.java | 8 ++++---- 1 file changed, 4 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 e8b7060c36..0d316041ac 100644 --- a/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java +++ b/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java @@ -25,15 +25,15 @@ */ 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.query.CannedQuerySortDetails; import org.alfresco.service.cmr.site.SiteInfo; import org.alfresco.util.Pair; -import java.util.Comparator; -import java.util.List; -import java.util.Optional; - /** * Conveys information for a member of a site. * From d405043c5d16f4cf2fe51c6cf7d34d8529fb5f68 Mon Sep 17 00:00:00 2001 From: vjanakiram Date: Wed, 27 Nov 2024 12:38:50 +0530 Subject: [PATCH 13/13] Update the SiteMembership --- .../src/main/java/org/alfresco/repo/site/SiteMembership.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0d316041ac..efbe210d6a 100644 --- a/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java +++ b/repository/src/main/java/org/alfresco/repo/site/SiteMembership.java @@ -78,7 +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 = Optional.ofNullable(lastName).orElse(""); this.isMemberOfGroup = isMemberOfGroup; }