diff --git a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java index dfb7eceeb..c48a32b81 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java @@ -297,9 +297,8 @@ public class AdminGroupAction extends FessAdminAction { } public static void validateAttributes(final Map attributes, final Consumer> throwError) { - ComponentUtil.getLdapManager().validateGroupAttributes(Long.class, attributes, s -> - throwError.accept(messages -> messages.addErrorsPropertyTypeLong("attributes." + s, - "attributes." + s))); + ComponentUtil.getLdapManager().validateGroupAttributes(Long.class, attributes, + s -> throwError.accept(messages -> messages.addErrorsPropertyTypeLong("attributes." + s, "attributes." + s))); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java index c36906962..6b093f330 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java @@ -359,9 +359,8 @@ public class AdminUserAction extends FessAdminAction { } public static void validateAttributes(final Map attributes, final Consumer> throwError) { - ComponentUtil.getLdapManager().validateUserAttributes(Long.class, attributes, s -> - throwError.accept(messages -> messages.addErrorsPropertyTypeLong("attributes." + s, - "attributes." + s))); + ComponentUtil.getLdapManager().validateUserAttributes(Long.class, attributes, + s -> throwError.accept(messages -> messages.addErrorsPropertyTypeLong("attributes." + s, "attributes." + s))); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/ldap/LdapManager.java b/src/main/java/org/codelibs/fess/ldap/LdapManager.java index 81bff4658..136023a56 100644 --- a/src/main/java/org/codelibs/fess/ldap/LdapManager.java +++ b/src/main/java/org/codelibs/fess/ldap/LdapManager.java @@ -886,14 +886,14 @@ public class LdapManager { final String attrUidNumber = fessConfig.getLdapAttrUidNumber(); final String attrGidNumber = fessConfig.getLdapAttrGidNumber(); - Stream.of(attrUidNumber, attrGidNumber).forEach(attrName -> - OptionalUtil.ofNullable(attributes.get(attrName)).filter(StringUtil::isNotBlank).ifPresent(s -> { - try { - DfTypeUtil.toLong(s); - } catch (final NumberFormatException e) { - consumer.accept(attrName); - } - })); + Stream.of(attrUidNumber, attrGidNumber).forEach( + attrName -> OptionalUtil.ofNullable(attributes.get(attrName)).filter(StringUtil::isNotBlank).ifPresent(s -> { + try { + DfTypeUtil.toLong(s); + } catch (final NumberFormatException e) { + consumer.accept(attrName); + } + })); } else { // do nothing } @@ -1043,14 +1043,14 @@ public class LdapManager { // Long type attributes final String attrGidNumber = fessConfig.getLdapAttrGidNumber(); - Stream.of(attrGidNumber).forEach(attrName -> - OptionalUtil.ofNullable(attributes.get(attrName)).filter(StringUtil::isNotBlank).ifPresent(s -> { - try { - DfTypeUtil.toLong(s); - } catch (final NumberFormatException e) { - consumer.accept(attrName); - } - })); + Stream.of(attrGidNumber).forEach( + attrName -> OptionalUtil.ofNullable(attributes.get(attrName)).filter(StringUtil::isNotBlank).ifPresent(s -> { + try { + DfTypeUtil.toLong(s); + } catch (final NumberFormatException e) { + consumer.accept(attrName); + } + })); } else { // do nothing }