Skip to content

Commit 542b90d

Browse files
ling-alan-huangbrianchandotcom
authored andcommitted
LPD-43765 SF, use TransformUtil.transformToList
1 parent f3eec0a commit 542b90d

File tree

2 files changed

+21
-16
lines changed

2 files changed

+21
-16
lines changed

modules/apps/account/account-service/src/main/java/com/liferay/account/internal/configuration/persistence/listener/AccountEntryEmailDomainsConfigurationModelListener.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.liferay.account.internal.validator.util.DomainValidatorFactoryUtil;
1010
import com.liferay.account.model.AccountEntry;
1111
import com.liferay.account.service.AccountEntryLocalService;
12+
import com.liferay.petra.function.transform.TransformUtil;
1213
import com.liferay.petra.string.CharPool;
1314
import com.liferay.petra.string.StringPool;
1415
import com.liferay.portal.configuration.persistence.listener.ConfigurationModelListener;
@@ -23,7 +24,6 @@
2324
import com.liferay.portal.kernel.util.LocaleThreadLocal;
2425
import com.liferay.portal.kernel.util.StringUtil;
2526

26-
import java.util.ArrayList;
2727
import java.util.Arrays;
2828
import java.util.Collections;
2929
import java.util.Dictionary;
@@ -109,13 +109,15 @@ public void onBeforeSave(String pid, Dictionary<String, Object> properties)
109109
GetterUtil.getStringValues(
110110
properties.get("customTLDs"), _EMPTY_STRING_ARRAY));
111111

112-
List<String> invalidDomains = new ArrayList<>();
112+
List<String> invalidDomains = TransformUtil.transformToList(
113+
blockedEmailAddressDomains,
114+
blockedEmailAddressDomain -> {
115+
if (!domainValidator.isValid(blockedEmailAddressDomain)) {
116+
return blockedEmailAddressDomain;
117+
}
113118

114-
for (String blockedEmailAddressDomain : blockedEmailAddressDomains) {
115-
if (!domainValidator.isValid(blockedEmailAddressDomain)) {
116-
invalidDomains.add(blockedEmailAddressDomain);
117-
}
118-
}
119+
return null;
120+
});
119121

120122
if (ListUtil.isNotEmpty(invalidDomains)) {
121123
throw new ConfigurationModelListenerException(

modules/apps/account/account-service/src/main/java/com/liferay/account/internal/configuration/persistence/listener/AccountEntryGroupConfigurationModelListener.java

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
import com.liferay.account.constants.AccountConstants;
99
import com.liferay.account.internal.configuration.AccountEntryGroupConfiguration;
1010
import com.liferay.account.internal.settings.AccountEntryGroupSettingsImpl;
11+
import com.liferay.petra.function.transform.TransformUtil;
1112
import com.liferay.portal.configuration.persistence.listener.ConfigurationModelListener;
1213
import com.liferay.portal.configuration.persistence.listener.ConfigurationModelListenerException;
1314
import com.liferay.portal.kernel.util.ArrayUtil;
1415
import com.liferay.portal.kernel.util.GetterUtil;
1516
import com.liferay.portal.kernel.util.ListUtil;
1617

17-
import java.util.ArrayList;
1818
import java.util.Dictionary;
1919
import java.util.List;
2020

@@ -44,16 +44,19 @@ public void onBeforeSave(String pid, Dictionary<String, Object> properties)
4444
AccountEntryGroupSettingsImpl.class, properties);
4545
}
4646

47-
List<String> invalidAllowedTypes = new ArrayList<>();
47+
List<String> invalidAllowedTypes = TransformUtil.transformToList(
48+
allowedTypes,
49+
allowedType -> {
50+
if (!ArrayUtil.contains(
51+
AccountConstants.
52+
ACCOUNT_ENTRY_TYPES_DEFAULT_ALLOWED_TYPES,
53+
allowedType)) {
4854

49-
for (String allowedType : allowedTypes) {
50-
if (!ArrayUtil.contains(
51-
AccountConstants.ACCOUNT_ENTRY_TYPES_DEFAULT_ALLOWED_TYPES,
52-
allowedType)) {
55+
return allowedType;
56+
}
5357

54-
invalidAllowedTypes.add(allowedType);
55-
}
56-
}
58+
return null;
59+
});
5760

5861
if (!invalidAllowedTypes.isEmpty()) {
5962
throw new ConfigurationModelListenerException(

0 commit comments

Comments
 (0)