LPD-43765 SF, use TransformUtil.transform

Author: ling-alan-huang

modules/apps/account/account-service/src/main/java/com/liferay/account/model/impl/AccountEntryImpl.java

@@ -7,10 +7,9 @@
 
 import com.liferay.account.constants.AccountConstants;
 import com.liferay.account.model.AccountEntry;
-import com.liferay.account.model.AccountEntryOrganizationRel;
-import com.liferay.account.model.AccountEntryUserRel;
 import com.liferay.account.service.AccountEntryOrganizationRelLocalServiceUtil;
 import com.liferay.account.service.AccountEntryUserRelLocalServiceUtil;
+import com.liferay.petra.function.transform.TransformUtil;
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
@@ -32,7 +31,6 @@
 import com.liferay.portal.kernel.service.WebsiteLocalServiceUtil;
 import com.liferay.portal.kernel.util.StringUtil;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -56,42 +54,36 @@ public Contact fetchContact() throws PortalException {
 
 	@Override
 	public List<Organization> fetchOrganizations() {
-		List<Organization> organizations = new ArrayList<>();
-
-		for (AccountEntryOrganizationRel accountEntryOrganizationRel :
-				AccountEntryOrganizationRelLocalServiceUtil.
-					getAccountEntryOrganizationRels(getAccountEntryId())) {
-
-			try {
-				organizations.add(
-					accountEntryOrganizationRel.getOrganization());
-			}
-			catch (PortalException portalException) {
-				_log.error(portalException);
-			}
-		}
+		return TransformUtil.transform(
+			AccountEntryOrganizationRelLocalServiceUtil.
+				getAccountEntryOrganizationRels(getAccountEntryId()),
+			accountEntryOrganizationRel -> {
+				try {
+					return accountEntryOrganizationRel.getOrganization();
+				}
+				catch (PortalException portalException) {
+					_log.error(portalException);
 
-		return organizations;
+					return null;
+				}
+			});
 	}
 
 	@Override
 	public List<User> fetchUsers() {
-		List<User> users = new ArrayList<>();
-
-		for (AccountEntryUserRel accountEntryUserRel :
-				AccountEntryUserRelLocalServiceUtil.
-					getAccountEntryUserRelsByAccountEntryId(
-						getAccountEntryId())) {
-
-			try {
-				users.add(accountEntryUserRel.getUser());
-			}
-			catch (PortalException portalException) {
-				_log.error(portalException);
-			}
-		}
-
-		return users;
+		return TransformUtil.transform(
+			AccountEntryUserRelLocalServiceUtil.
+				getAccountEntryUserRelsByAccountEntryId(getAccountEntryId()),
+			accountEntryUserRel -> {
+				try {
+					return accountEntryUserRel.getUser();
+				}
+				catch (PortalException portalException) {
+					_log.error(portalException);
+
+					return null;
+				}
+			});
 	}
 
 	@Override

modules/apps/account/account-service/src/main/java/com/liferay/account/service/impl/AccountRoleLocalServiceImpl.java

@@ -42,7 +42,6 @@
 import com.liferay.portal.search.searcher.Searcher;
 import com.liferay.portal.util.PortalInstances;
 
-import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
@@ -305,18 +304,17 @@ public void setUserAccountRoles(
 			long accountEntryId, long[] accountRoleIds, long userId)
 		throws PortalException {
 
-		List<AccountRole> removeAccountRoles = new ArrayList<>();
+		List<AccountRole> removeAccountRoles = TransformUtil.transform(
+			getAccountRoles(accountEntryId, userId),
+			accountRole -> {
+				if (!ArrayUtil.contains(
+						accountRoleIds, accountRole.getAccountRoleId())) {
 
-		List<AccountRole> currentAccountRoles = getAccountRoles(
-			accountEntryId, userId);
-
-		for (AccountRole accountRole : currentAccountRoles) {
-			if (!ArrayUtil.contains(
-					accountRoleIds, accountRole.getAccountRoleId())) {
+					return accountRole;
+				}
 
-				removeAccountRoles.add(accountRole);
-			}
-		}
+				return null;
+			});
 
 		associateUser(accountEntryId, accountRoleIds, userId);