diff --git a/src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java b/src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java index 8b5daa902..68912347e 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java @@ -67,13 +67,12 @@ public class AdminBackupAction extends FessAdminAction { } private List> getBackupItems() { - return stream(fessConfig.getIndexBackupTargetsAsArray()).get( - stream -> stream.filter(name -> StringUtil.isNotBlank(name)).map(name -> { - final Map map = new HashMap<>(); - map.put("id", name); - map.put("name", name); - return map; - }).collect(Collectors.toList())); + return stream(fessConfig.getIndexBackupTargetsAsArray()).get(stream -> stream.filter(StringUtil::isNotBlank).map(name -> { + final Map map = new HashMap<>(); + map.put("id", name); + map.put("name", name); + return map; + }).collect(Collectors.toList())); } private HtmlResponse asIndexHtml() { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java index 1e896feb9..e84ff6b4a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java @@ -150,8 +150,8 @@ public class AdminDataconfigAction extends FessAdminAction { final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper(); form.permissions = stream(entity.getPermissions()).get( - stream -> stream.map(s -> permissionHelper.decode(s)).filter(s -> StringUtil.isNotBlank(s)) - .distinct().collect(Collectors.joining("\n"))); + stream -> stream.map(s -> permissionHelper.decode(s)).filter(StringUtil::isNotBlank).distinct() + .collect(Collectors.joining("\n"))); }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asListHtml()); }); @@ -189,7 +189,7 @@ public class AdminDataconfigAction extends FessAdminAction { form.permissions = stream(entity.getPermissions()).get( stream -> stream.map(s -> permissionHelper.decode(s)) - .filter(s -> StringUtil.isNotBlank(s)).distinct() + .filter(StringUtil::isNotBlank).distinct() .collect(Collectors.joining("\n"))); form.crudMode = crudMode; }) @@ -304,7 +304,7 @@ public class AdminDataconfigAction extends FessAdminAction { n -> new String[n]))); final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper(); entity.setPermissions(stream(form.permissions.split("\n")).get( - stream -> stream.map(s -> permissionHelper.encode(s)).filter(s -> StringUtil.isNotBlank(s)).distinct() + stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).distinct() .toArray(n -> new String[n]))); return entity; }); diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/seunjeon/AdminDictSeunjeonAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/seunjeon/AdminDictSeunjeonAction.java index ca725daf5..e6f66ea0e 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/seunjeon/AdminDictSeunjeonAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/seunjeon/AdminDictSeunjeonAction.java @@ -364,8 +364,7 @@ public class AdminDictSeunjeonAction extends FessAdminAction { if (StringUtil.isBlank(value)) { return StringUtil.EMPTY_STRINGS; } - return stream(value.split(",")).get( - stream -> stream.filter(s -> StringUtil.isNotBlank(s)).map(s -> s.trim()).toArray(n -> new String[n])); + return stream(value.split(",")).get(stream -> stream.filter(StringUtil::isNotBlank).map(s -> s.trim()).toArray(n -> new String[n])); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java index 255fe8b18..3859d49ef 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java @@ -145,8 +145,8 @@ public class AdminFileconfigAction extends FessAdminAction { final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper(); form.permissions = stream(entity.getPermissions()).get( - stream -> stream.map(s -> permissionHelper.decode(s)).filter(s -> StringUtil.isNotBlank(s)) - .distinct().collect(Collectors.joining("\n"))); + stream -> stream.map(s -> permissionHelper.decode(s)).filter(StringUtil::isNotBlank).distinct() + .collect(Collectors.joining("\n"))); }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asListHtml()); }); @@ -184,7 +184,7 @@ public class AdminFileconfigAction extends FessAdminAction { form.permissions = stream(entity.getPermissions()).get( stream -> stream.map(s -> permissionHelper.decode(s)) - .filter(s -> StringUtil.isNotBlank(s)).distinct() + .filter(StringUtil::isNotBlank).distinct() .collect(Collectors.joining("\n"))); form.crudMode = crudMode; }) @@ -301,7 +301,7 @@ public class AdminFileconfigAction extends FessAdminAction { n -> new String[n]))); final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper(); entity.setPermissions(stream(form.permissions.split("\n")).get( - stream -> stream.map(s -> permissionHelper.encode(s)).filter(s -> StringUtil.isNotBlank(s)).distinct() + stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).distinct() .toArray(n -> new String[n]))); return entity; }); diff --git a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java index 09c6a88f4..39167b823 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java @@ -143,8 +143,8 @@ public class AdminLabeltypeAction extends FessAdminAction { final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper(); form.permissions = stream(entity.getPermissions()).get( - stream -> stream.map(s -> permissionHelper.decode(s)).filter(s -> StringUtil.isNotBlank(s)) - .distinct().collect(Collectors.joining("\n"))); + stream -> stream.map(s -> permissionHelper.decode(s)).filter(StringUtil::isNotBlank).distinct() + .collect(Collectors.joining("\n"))); }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asListHtml()); }); @@ -182,7 +182,7 @@ public class AdminLabeltypeAction extends FessAdminAction { form.permissions = stream(entity.getPermissions()).get( stream -> stream.map(s -> permissionHelper.decode(s)) - .filter(s -> StringUtil.isNotBlank(s)).distinct() + .filter(StringUtil::isNotBlank).distinct() .collect(Collectors.joining("\n"))); form.crudMode = crudMode; }) @@ -300,7 +300,7 @@ public class AdminLabeltypeAction extends FessAdminAction { n -> new String[n]))); final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper(); entity.setPermissions(stream(form.permissions.split("\n")).get( - stream -> stream.map(s -> permissionHelper.encode(s)).filter(s -> StringUtil.isNotBlank(s)).distinct() + stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).distinct() .toArray(n -> new String[n]))); return entity; }); diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java index 26fc39fe4..f6bafb5a1 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java @@ -68,7 +68,7 @@ public class ListForm implements SearchRequestParams, Serializable { @Override public String[] getExtraQueries() { - return stream(ex_q).get(stream -> stream.filter(q -> StringUtil.isNotBlank(q)).distinct().toArray(n -> new String[n])); + return stream(ex_q).get(stream -> stream.filter(StringUtil::isNotBlank).distinct().toArray(n -> new String[n])); } @Override @@ -98,7 +98,7 @@ public class ListForm implements SearchRequestParams, Serializable { @Override public String[] getLanguages() { - return stream(lang).get(stream -> stream.filter(q -> StringUtil.isNotBlank(q)).distinct().toArray(n -> new String[n])); + return stream(lang).get(stream -> stream.filter(StringUtil::isNotBlank).distinct().toArray(n -> new String[n])); } @Override diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java index 0943fcee5..b5843fe5c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java @@ -147,8 +147,8 @@ public class AdminWebconfigAction extends FessAdminAction { final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper(); form.permissions = stream(entity.getPermissions()).get( - stream -> stream.map(s -> permissionHelper.decode(s)).filter(s -> StringUtil.isNotBlank(s)) - .distinct().collect(Collectors.joining("\n"))); + stream -> stream.map(s -> permissionHelper.decode(s)).filter(StringUtil::isNotBlank).distinct() + .collect(Collectors.joining("\n"))); }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asListHtml()); }); @@ -186,7 +186,7 @@ public class AdminWebconfigAction extends FessAdminAction { form.permissions = stream(entity.getPermissions()).get( stream -> stream.map(s -> permissionHelper.decode(s)) - .filter(s -> StringUtil.isNotBlank(s)).distinct() + .filter(StringUtil::isNotBlank).distinct() .collect(Collectors.joining("\n"))); form.crudMode = crudMode; }) @@ -301,7 +301,7 @@ public class AdminWebconfigAction extends FessAdminAction { n -> new String[n]))); final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper(); entity.setPermissions(stream(form.permissions.split("\n")).get( - stream -> stream.map(s -> permissionHelper.encode(s)).filter(s -> StringUtil.isNotBlank(s)).distinct() + stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).distinct() .toArray(n -> new String[n]))); return entity; }); diff --git a/src/main/java/org/codelibs/fess/app/web/base/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/base/SearchForm.java index 3ebf46797..dca5dc1cd 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/base/SearchForm.java @@ -93,7 +93,7 @@ public class SearchForm implements SearchRequestParams, Serializable { @Override public String[] getExtraQueries() { - return stream(ex_q).get(stream -> stream.filter(q -> StringUtil.isNotBlank(q)).distinct().toArray(n -> new String[n])); + return stream(ex_q).get(stream -> stream.filter(StringUtil::isNotBlank).distinct().toArray(n -> new String[n])); } @Override @@ -103,7 +103,7 @@ public class SearchForm implements SearchRequestParams, Serializable { @Override public String[] getLanguages() { - return stream(lang).get(stream -> stream.filter(q -> StringUtil.isNotBlank(q)).distinct().toArray(n -> new String[n])); + return stream(lang).get(stream -> stream.filter(StringUtil::isNotBlank).distinct().toArray(n -> new String[n])); } @Override diff --git a/src/main/java/org/codelibs/fess/app/web/search/SearchAction.java b/src/main/java/org/codelibs/fess/app/web/search/SearchAction.java index c4679dc36..40cc03a6b 100644 --- a/src/main/java/org/codelibs/fess/app/web/search/SearchAction.java +++ b/src/main/java/org/codelibs/fess/app/web/search/SearchAction.java @@ -201,7 +201,7 @@ public class SearchAction extends FessSearchAction { final List pagingQueryList = new ArrayList<>(); if (form.ex_q != null) { stream(form.ex_q).of( - stream -> stream.filter(q -> StringUtil.isNotBlank(q)).distinct() + stream -> stream.filter(StringUtil::isNotBlank).distinct() .forEach(q -> pagingQueryList.add("ex_q=" + LaFunctions.u(q)))); } if (StringUtil.isNotBlank(form.sort)) { diff --git a/src/main/java/org/codelibs/fess/entity/SearchRequestParams.java b/src/main/java/org/codelibs/fess/entity/SearchRequestParams.java index 1fb791404..e5cbaf052 100644 --- a/src/main/java/org/codelibs/fess/entity/SearchRequestParams.java +++ b/src/main/java/org/codelibs/fess/entity/SearchRequestParams.java @@ -51,7 +51,7 @@ public interface SearchRequestParams { Locale getLocale(); public default String[] simplifyArray(final String[] values) { - return stream(values).get(stream -> stream.filter(q -> StringUtil.isNotBlank(q)).distinct().toArray(n -> new String[n])); + return stream(values).get(stream -> stream.filter(StringUtil::isNotBlank).distinct().toArray(n -> new String[n])); } public default String[] getParamValueArray(final HttpServletRequest request, final String param) { diff --git a/src/main/java/org/codelibs/fess/helper/PopularWordHelper.java b/src/main/java/org/codelibs/fess/helper/PopularWordHelper.java index c41f12217..e047f13bf 100644 --- a/src/main/java/org/codelibs/fess/helper/PopularWordHelper.java +++ b/src/main/java/org/codelibs/fess/helper/PopularWordHelper.java @@ -57,7 +57,7 @@ public class PopularWordHelper { final String baseSeed = seed != null ? seed : fessConfig.getSuggestPopularWordSeed(); final String[] baseTags = tags != null ? tags : fessConfig.getSuggestPopularWordTagsAsArray(); final String[] baseRoles = - roles != null ? roles : ComponentUtil.getRoleQueryHelper().build().stream().filter(s -> StringUtil.isNotBlank(s)) + roles != null ? roles : ComponentUtil.getRoleQueryHelper().build().stream().filter(StringUtil::isNotBlank) .toArray(n -> new String[n]); final String[] baseFields = fields != null ? fields : fessConfig.getSuggestPopularWordFieldsAsArray(); final String[] baseExcludes = excludes != null ? excludes : fessConfig.getSuggestPopularWordExcludesAsArray(); diff --git a/src/main/java/org/codelibs/fess/job/CrawlJob.java b/src/main/java/org/codelibs/fess/job/CrawlJob.java index b5692afec..87201b4a8 100644 --- a/src/main/java/org/codelibs/fess/job/CrawlJob.java +++ b/src/main/java/org/codelibs/fess/job/CrawlJob.java @@ -325,7 +325,7 @@ public class CrawlJob { cmdList.add("-Dfess.log.level=" + logLevel); } stream(fessConfig.getJvmCrawlerOptionsAsArray()).of( - stream -> stream.filter(value -> StringUtil.isNotBlank(value)).forEach(value -> cmdList.add(value))); + stream -> stream.filter(StringUtil::isNotBlank).forEach(value -> cmdList.add(value))); File ownTmpDir = null; final String tmpDir = System.getProperty("java.io.tmpdir"); @@ -339,7 +339,7 @@ public class CrawlJob { } if (StringUtil.isNotBlank(jvmOptions)) { - stream(jvmOptions.split(" ")).of(stream -> stream.filter(s -> StringUtil.isNotBlank(s)).forEach(s -> cmdList.add(s))); + stream(jvmOptions.split(" ")).of(stream -> stream.filter(StringUtil::isNotBlank).forEach(s -> cmdList.add(s))); } cmdList.add(Crawler.class.getCanonicalName()); diff --git a/src/main/java/org/codelibs/fess/job/SuggestJob.java b/src/main/java/org/codelibs/fess/job/SuggestJob.java index 7e1618066..2e1723b17 100644 --- a/src/main/java/org/codelibs/fess/job/SuggestJob.java +++ b/src/main/java/org/codelibs/fess/job/SuggestJob.java @@ -197,7 +197,7 @@ public class SuggestJob { cmdList.add("-Dfess.log.level=" + logLevel); } stream(fessConfig.getJvmSuggestOptionsAsArray()).of( - stream -> stream.filter(value -> StringUtil.isNotBlank(value)).forEach(value -> cmdList.add(value))); + stream -> stream.filter(StringUtil::isNotBlank).forEach(value -> cmdList.add(value))); File ownTmpDir = null; final String tmpDir = System.getProperty("java.io.tmpdir"); diff --git a/src/main/java/org/codelibs/fess/ldap/LdapManager.java b/src/main/java/org/codelibs/fess/ldap/LdapManager.java index 1e888f0cc..c6f0767f0 100644 --- a/src/main/java/org/codelibs/fess/ldap/LdapManager.java +++ b/src/main/java/org/codelibs/fess/ldap/LdapManager.java @@ -442,214 +442,212 @@ public class LdapManager { final String attrSurname = fessConfig.getLdapAttrSurname(); OptionalUtil .ofNullable(user.getSurname()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrSurname, s)) .orElse(() -> getAttributeValueList(result, attrSurname).stream().forEach( v -> modifyDeleteEntry(modifyList, attrSurname, v))); final String attrGivenName = fessConfig.getLdapAttrGivenName(); OptionalUtil .ofNullable(user.getGivenName()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrGivenName, s)) .orElse(() -> getAttributeValueList(result, attrGivenName).stream().forEach( v -> modifyDeleteEntry(modifyList, attrGivenName, v))); final String attrMail = fessConfig.getLdapAttrMail(); - OptionalUtil.ofNullable(user.getMail()).filter(s -> StringUtil.isNotBlank(s)) - .ifPresent(s -> modifyReplaceEntry(modifyList, attrMail, s)) + OptionalUtil.ofNullable(user.getMail()).filter(StringUtil::isNotBlank).ifPresent(s -> modifyReplaceEntry(modifyList, attrMail, s)) .orElse(() -> getAttributeValueList(result, attrMail).stream().forEach(v -> modifyDeleteEntry(modifyList, attrMail, v))); final String attrEmployeeNumber = fessConfig.getLdapAttrEmployeeNumber(); OptionalUtil .ofNullable(user.getEmployeeNumber()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrEmployeeNumber, s)) .orElse(() -> getAttributeValueList(result, attrEmployeeNumber).stream().forEach( v -> modifyDeleteEntry(modifyList, attrEmployeeNumber, v))); final String attrTelephoneNumber = fessConfig.getLdapAttrTelephoneNumber(); OptionalUtil .ofNullable(user.getTelephoneNumber()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrTelephoneNumber, s)) .orElse(() -> getAttributeValueList(result, attrTelephoneNumber).stream().forEach( v -> modifyDeleteEntry(modifyList, attrTelephoneNumber, v))); final String attrHomePhone = fessConfig.getLdapAttrHomePhone(); OptionalUtil .ofNullable(user.getHomePhone()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrHomePhone, s)) .orElse(() -> getAttributeValueList(result, attrHomePhone).stream().forEach( v -> modifyDeleteEntry(modifyList, attrHomePhone, v))); final String attrHomePostalAddress = fessConfig.getLdapAttrHomePostalAddress(); OptionalUtil .ofNullable(user.getHomePostalAddress()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrHomePostalAddress, s)) .orElse(() -> getAttributeValueList(result, attrHomePostalAddress).stream().forEach( v -> modifyDeleteEntry(modifyList, attrHomePostalAddress, v))); final String attrLabeledURI = fessConfig.getLdapAttrLabeleduri(); OptionalUtil .ofNullable(user.getLabeledURI()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrLabeledURI, s)) .orElse(() -> getAttributeValueList(result, attrLabeledURI).stream().forEach( v -> modifyDeleteEntry(modifyList, attrLabeledURI, v))); final String attrRoomNumber = fessConfig.getLdapAttrRoomNumber(); OptionalUtil .ofNullable(user.getRoomNumber()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrRoomNumber, s)) .orElse(() -> getAttributeValueList(result, attrRoomNumber).stream().forEach( v -> modifyDeleteEntry(modifyList, attrRoomNumber, v))); final String attrDescription = fessConfig.getLdapAttrDescription(); OptionalUtil .ofNullable(user.getDescription()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrDescription, s)) .orElse(() -> getAttributeValueList(result, attrDescription).stream().forEach( v -> modifyDeleteEntry(modifyList, attrDescription, v))); final String attrTitle = fessConfig.getLdapAttrTitle(); - OptionalUtil.ofNullable(user.getTitle()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getTitle()).filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrTitle, s)) .orElse(() -> getAttributeValueList(result, attrTitle).stream().forEach(v -> modifyDeleteEntry(modifyList, attrTitle, v))); final String attrPager = fessConfig.getLdapAttrPager(); - OptionalUtil.ofNullable(user.getPager()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getPager()).filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrPager, s)) .orElse(() -> getAttributeValueList(result, attrPager).stream().forEach(v -> modifyDeleteEntry(modifyList, attrPager, v))); final String attrStreet = fessConfig.getLdapAttrStreet(); OptionalUtil .ofNullable(user.getStreet()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrStreet, s)) .orElse(() -> getAttributeValueList(result, attrStreet).stream().forEach(v -> modifyDeleteEntry(modifyList, attrStreet, v))); final String attrPostalCode = fessConfig.getLdapAttrPostalCode(); OptionalUtil .ofNullable(user.getPostalCode()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrPostalCode, s)) .orElse(() -> getAttributeValueList(result, attrPostalCode).stream().forEach( v -> modifyDeleteEntry(modifyList, attrPostalCode, v))); final String attrPhysicalDeliveryOfficeName = fessConfig.getLdapAttrPhysicalDeliveryOfficeName(); OptionalUtil .ofNullable(user.getPhysicalDeliveryOfficeName()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrPhysicalDeliveryOfficeName, s)) .orElse(() -> getAttributeValueList(result, attrPhysicalDeliveryOfficeName).stream().forEach( v -> modifyDeleteEntry(modifyList, attrPhysicalDeliveryOfficeName, v))); final String attrDestinationIndicator = fessConfig.getLdapAttrDestinationIndicator(); OptionalUtil .ofNullable(user.getDestinationIndicator()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrDestinationIndicator, s)) .orElse(() -> getAttributeValueList(result, attrDestinationIndicator).stream().forEach( v -> modifyDeleteEntry(modifyList, attrDestinationIndicator, v))); final String attrInternationaliSDNNumber = fessConfig.getLdapAttrInternationalisdnNumber(); OptionalUtil .ofNullable(user.getInternationaliSDNNumber()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrInternationaliSDNNumber, s)) .orElse(() -> getAttributeValueList(result, attrInternationaliSDNNumber).stream().forEach( v -> modifyDeleteEntry(modifyList, attrInternationaliSDNNumber, v))); final String attrState = fessConfig.getLdapAttrState(); - OptionalUtil.ofNullable(user.getState()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getState()).filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrState, s)) .orElse(() -> getAttributeValueList(result, attrState).stream().forEach(v -> modifyDeleteEntry(modifyList, attrState, v))); final String attrEmployeeType = fessConfig.getLdapAttrEmployeeType(); OptionalUtil .ofNullable(user.getEmployeeType()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrEmployeeType, s)) .orElse(() -> getAttributeValueList(result, attrEmployeeType).stream().forEach( v -> modifyDeleteEntry(modifyList, attrEmployeeType, v))); final String attrFacsimileTelephoneNumber = fessConfig.getLdapAttrFacsimileTelephoneNumber(); OptionalUtil .ofNullable(user.getFacsimileTelephoneNumber()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrFacsimileTelephoneNumber, s)) .orElse(() -> getAttributeValueList(result, attrFacsimileTelephoneNumber).stream().forEach( v -> modifyDeleteEntry(modifyList, attrFacsimileTelephoneNumber, v))); final String attrPostOfficeBox = fessConfig.getLdapAttrPostOfficeBox(); OptionalUtil .ofNullable(user.getPostOfficeBox()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrPostOfficeBox, s)) .orElse(() -> getAttributeValueList(result, attrPostOfficeBox).stream().forEach( v -> modifyDeleteEntry(modifyList, attrPostOfficeBox, v))); final String attrInitials = fessConfig.getLdapAttrInitials(); OptionalUtil .ofNullable(user.getInitials()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrInitials, s)) .orElse(() -> getAttributeValueList(result, attrInitials).stream().forEach( v -> modifyDeleteEntry(modifyList, attrInitials, v))); final String attrCarLicense = fessConfig.getLdapAttrCarLicense(); OptionalUtil .ofNullable(user.getCarLicense()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrCarLicense, s)) .orElse(() -> getAttributeValueList(result, attrCarLicense).stream().forEach( v -> modifyDeleteEntry(modifyList, attrCarLicense, v))); final String attrMobile = fessConfig.getLdapAttrMobile(); OptionalUtil .ofNullable(user.getMobile()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrMobile, s)) .orElse(() -> getAttributeValueList(result, attrMobile).stream().forEach(v -> modifyDeleteEntry(modifyList, attrMobile, v))); final String attrPostalAddress = fessConfig.getLdapAttrPostalAddress(); OptionalUtil .ofNullable(user.getPostalAddress()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrPostalAddress, s)) .orElse(() -> getAttributeValueList(result, attrPostalAddress).stream().forEach( v -> modifyDeleteEntry(modifyList, attrPostalAddress, v))); final String attrCity = fessConfig.getLdapAttrCity(); - OptionalUtil.ofNullable(user.getCity()).filter(s -> StringUtil.isNotBlank(s)) - .ifPresent(s -> modifyReplaceEntry(modifyList, attrCity, s)) + OptionalUtil.ofNullable(user.getCity()).filter(StringUtil::isNotBlank).ifPresent(s -> modifyReplaceEntry(modifyList, attrCity, s)) .orElse(() -> getAttributeValueList(result, attrCity).stream().forEach(v -> modifyDeleteEntry(modifyList, attrCity, v))); final String attrTeletexTerminalIdentifier = fessConfig.getLdapAttrTeletexTerminalIdentifier(); OptionalUtil .ofNullable(user.getTeletexTerminalIdentifier()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrTeletexTerminalIdentifier, s)) .orElse(() -> getAttributeValueList(result, attrTeletexTerminalIdentifier).stream().forEach( v -> modifyDeleteEntry(modifyList, attrTeletexTerminalIdentifier, v))); final String attrX121Address = fessConfig.getLdapAttrX121Address(); OptionalUtil .ofNullable(user.getX121Address()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrX121Address, s)) .orElse(() -> getAttributeValueList(result, attrX121Address).stream().forEach( v -> modifyDeleteEntry(modifyList, attrX121Address, v))); final String attrBusinessCategory = fessConfig.getLdapAttrBusinessCategory(); OptionalUtil .ofNullable(user.getBusinessCategory()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrBusinessCategory, s)) .orElse(() -> getAttributeValueList(result, attrBusinessCategory).stream().forEach( v -> modifyDeleteEntry(modifyList, attrBusinessCategory, v))); final String attrRegisteredAddress = fessConfig.getLdapAttrRegisteredAddress(); OptionalUtil .ofNullable(user.getRegisteredAddress()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrRegisteredAddress, s)) .orElse(() -> getAttributeValueList(result, attrRegisteredAddress).stream().forEach( v -> modifyDeleteEntry(modifyList, attrRegisteredAddress, v))); final String attrDisplayName = fessConfig.getLdapAttrDisplayName(); OptionalUtil .ofNullable(user.getDisplayName()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrDisplayName, s)) .orElse(() -> getAttributeValueList(result, attrDisplayName).stream().forEach( v -> modifyDeleteEntry(modifyList, attrDisplayName, v))); final String attrPreferredLanguage = fessConfig.getLdapAttrPreferredLanguage(); OptionalUtil .ofNullable(user.getPreferredLanguage()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrPreferredLanguage, s)) .orElse(() -> getAttributeValueList(result, attrPreferredLanguage).stream().forEach( v -> modifyDeleteEntry(modifyList, attrPreferredLanguage, v))); final String attrDepartmentNumber = fessConfig.getLdapAttrDepartmentNumber(); OptionalUtil .ofNullable(user.getDepartmentNumber()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrDepartmentNumber, s)) .orElse(() -> getAttributeValueList(result, attrDepartmentNumber).stream().forEach( v -> modifyDeleteEntry(modifyList, attrDepartmentNumber, v))); @@ -670,7 +668,7 @@ public class LdapManager { final String attrHomeDirectory = fessConfig.getLdapAttrHomeDirectory(); OptionalUtil .ofNullable(user.getHomeDirectory()) - .filter(s -> StringUtil.isNotBlank(s)) + .filter(StringUtil::isNotBlank) .ifPresent(s -> modifyReplaceEntry(modifyList, attrHomeDirectory, s)) .orElse(() -> getAttributeValueList(result, attrHomeDirectory).stream().forEach( v -> modifyDeleteEntry(modifyList, attrHomeDirectory, v))); @@ -682,77 +680,77 @@ public class LdapManager { entry.put(new BasicAttribute("cn", user.getName())); entry.put(new BasicAttribute("userPassword", user.getOriginalPassword())); - OptionalUtil.ofNullable(user.getSurname()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getSurname()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrSurname(), s))); - OptionalUtil.ofNullable(user.getGivenName()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getGivenName()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrGivenName(), s))); - OptionalUtil.ofNullable(user.getMail()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getMail()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrMail(), s))); - OptionalUtil.ofNullable(user.getEmployeeNumber()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getEmployeeNumber()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrEmployeeNumber(), s))); - OptionalUtil.ofNullable(user.getTelephoneNumber()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getTelephoneNumber()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrTelephoneNumber(), s))); - OptionalUtil.ofNullable(user.getHomePhone()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getHomePhone()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrHomePhone(), s))); - OptionalUtil.ofNullable(user.getHomePostalAddress()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getHomePostalAddress()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrHomePostalAddress(), s))); - OptionalUtil.ofNullable(user.getLabeledURI()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getLabeledURI()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrLabeleduri(), s))); - OptionalUtil.ofNullable(user.getRoomNumber()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getRoomNumber()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrRoomNumber(), s))); - OptionalUtil.ofNullable(user.getDescription()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getDescription()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrDescription(), s))); - OptionalUtil.ofNullable(user.getTitle()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getTitle()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrTitle(), s))); - OptionalUtil.ofNullable(user.getPager()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getPager()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrPager(), s))); - OptionalUtil.ofNullable(user.getStreet()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getStreet()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrStreet(), s))); - OptionalUtil.ofNullable(user.getPostalCode()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getPostalCode()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrPostalCode(), s))); - OptionalUtil.ofNullable(user.getPhysicalDeliveryOfficeName()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getPhysicalDeliveryOfficeName()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrPhysicalDeliveryOfficeName(), s))); - OptionalUtil.ofNullable(user.getDestinationIndicator()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getDestinationIndicator()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrDestinationIndicator(), s))); - OptionalUtil.ofNullable(user.getInternationaliSDNNumber()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getInternationaliSDNNumber()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrInternationalisdnNumber(), s))); - OptionalUtil.ofNullable(user.getState()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getState()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrState(), s))); - OptionalUtil.ofNullable(user.getEmployeeType()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getEmployeeType()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrEmployeeType(), s))); - OptionalUtil.ofNullable(user.getFacsimileTelephoneNumber()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getFacsimileTelephoneNumber()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrFacsimileTelephoneNumber(), s))); - OptionalUtil.ofNullable(user.getPostOfficeBox()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getPostOfficeBox()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrPostOfficeBox(), s))); - OptionalUtil.ofNullable(user.getInitials()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getInitials()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrInitials(), s))); - OptionalUtil.ofNullable(user.getCarLicense()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getCarLicense()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrCarLicense(), s))); - OptionalUtil.ofNullable(user.getMobile()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getMobile()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrMobile(), s))); - OptionalUtil.ofNullable(user.getPostalAddress()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getPostalAddress()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrPostalAddress(), s))); - OptionalUtil.ofNullable(user.getCity()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getCity()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrCity(), s))); - OptionalUtil.ofNullable(user.getTeletexTerminalIdentifier()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getTeletexTerminalIdentifier()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrTeletexTerminalIdentifier(), s))); - OptionalUtil.ofNullable(user.getX121Address()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getX121Address()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrX121Address(), s))); - OptionalUtil.ofNullable(user.getBusinessCategory()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getBusinessCategory()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrBusinessCategory(), s))); - OptionalUtil.ofNullable(user.getRegisteredAddress()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getRegisteredAddress()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrRegisteredAddress(), s))); - OptionalUtil.ofNullable(user.getDisplayName()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getDisplayName()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrDisplayName(), s))); - OptionalUtil.ofNullable(user.getPreferredLanguage()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getPreferredLanguage()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrPreferredLanguage(), s))); - OptionalUtil.ofNullable(user.getDepartmentNumber()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getDepartmentNumber()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrDepartmentNumber(), s))); OptionalUtil.ofNullable(user.getUidNumber()).filter(s -> StringUtil.isNotBlank(s.toString())) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrUidNumber(), s))); OptionalUtil.ofNullable(user.getGidNumber()).filter(s -> StringUtil.isNotBlank(s.toString())) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrGidNumber(), s))); - OptionalUtil.ofNullable(user.getHomeDirectory()).filter(s -> StringUtil.isNotBlank(s)) + OptionalUtil.ofNullable(user.getHomeDirectory()).filter(StringUtil::isNotBlank) .ifPresent(s -> entry.put(new BasicAttribute(fessConfig.getLdapAttrHomeDirectory(), s))); }