Browse Source

code formatter

Shinsuke Sugaya 5 years ago
parent
commit
31f2e82bd6

+ 2 - 3
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<String, String> attributes, final Consumer<VaMessenger<FessMessages>> 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)));
     }
 
     // ===================================================================================

+ 2 - 3
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<String, String> attributes, final Consumer<VaMessenger<FessMessages>> 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)));
     }
 
     // ===================================================================================

+ 16 - 16
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
         }