diff --git a/src/main/java/org/codelibs/fess/entity/QueryContext.java b/src/main/java/org/codelibs/fess/entity/QueryContext.java index 481a8014e..ec440b910 100644 --- a/src/main/java/org/codelibs/fess/entity/QueryContext.java +++ b/src/main/java/org/codelibs/fess/entity/QueryContext.java @@ -22,9 +22,9 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.function.Consumer; -import java.util.stream.Stream; import org.codelibs.fess.Constants; +import org.codelibs.fess.util.StreamUtil; import org.elasticsearch.index.query.BoolQueryBuilder; import org.elasticsearch.index.query.MatchAllQueryBuilder; import org.elasticsearch.index.query.QueryBuilder; @@ -78,7 +78,7 @@ public class QueryContext { } public void addSorts(final SortBuilder... sortBuilders) { - Stream.of(sortBuilders).forEach(sortBuilder -> sortBuilderList.add(sortBuilder)); + StreamUtil.of(sortBuilders).forEach(sortBuilder -> sortBuilderList.add(sortBuilder)); } public boolean hasSorts() { diff --git a/src/main/java/org/codelibs/fess/es/user/exentity/User.java b/src/main/java/org/codelibs/fess/es/user/exentity/User.java index 96b6ea389..eafd96291 100644 --- a/src/main/java/org/codelibs/fess/es/user/exentity/User.java +++ b/src/main/java/org/codelibs/fess/es/user/exentity/User.java @@ -16,10 +16,10 @@ package org.codelibs.fess.es.user.exentity; import java.util.Base64; -import java.util.stream.Stream; import org.codelibs.fess.Constants; import org.codelibs.fess.es.user.bsentity.BsUser; +import org.codelibs.fess.util.StreamUtil; /** * @author FreeGen @@ -45,12 +45,12 @@ public class User extends BsUser { } public String[] getRoleNames() { - return Stream.of(getRoles()).map(role -> new String(Base64.getDecoder().decode(role), Constants.CHARSET_UTF_8)) + return StreamUtil.of(getRoles()).map(role -> new String(Base64.getDecoder().decode(role), Constants.CHARSET_UTF_8)) .toArray(n -> new String[n]); } public String[] getGroupNames() { - return Stream.of(getGroups()).map(group -> new String(Base64.getDecoder().decode(group), Constants.CHARSET_UTF_8)) + return StreamUtil.of(getGroups()).map(group -> new String(Base64.getDecoder().decode(group), Constants.CHARSET_UTF_8)) .toArray(n -> new String[n]); } diff --git a/src/main/java/org/codelibs/fess/exec/Crawler.java b/src/main/java/org/codelibs/fess/exec/Crawler.java index 0f86bbcf1..459706f7d 100644 --- a/src/main/java/org/codelibs/fess/exec/Crawler.java +++ b/src/main/java/org/codelibs/fess/exec/Crawler.java @@ -26,7 +26,6 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Stream; import javax.annotation.Resource; @@ -48,6 +47,7 @@ import org.codelibs.fess.helper.WebFsIndexHelper; import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.mylasta.mail.CrawlerPostcard; import org.codelibs.fess.util.ComponentUtil; +import org.codelibs.fess.util.StreamUtil; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.kohsuke.args4j.CmdLineException; @@ -300,7 +300,7 @@ public class Crawler implements Serializable { CrawlerPostcard.droppedInto(postbox, postcard -> { postcard.setFrom(fessConfig.getMailFromAddress(), fessConfig.getMailFromName()); postcard.addReplyTo(fessConfig.getMailReturnPath()); - Stream.of(toAddresses).forEach(address -> { + StreamUtil.of(toAddresses).forEach(address -> { postcard.addTo(address); }); BeanUtil.copyMapToBean(dataMap, postcard); diff --git a/src/main/java/org/codelibs/fess/helper/QueryHelper.java b/src/main/java/org/codelibs/fess/helper/QueryHelper.java index 5f4f05071..ef8fe29a3 100644 --- a/src/main/java/org/codelibs/fess/helper/QueryHelper.java +++ b/src/main/java/org/codelibs/fess/helper/QueryHelper.java @@ -53,6 +53,7 @@ import org.codelibs.fess.entity.FacetInfo; import org.codelibs.fess.entity.GeoInfo; import org.codelibs.fess.entity.QueryContext; import org.codelibs.fess.exception.InvalidQueryException; +import org.codelibs.fess.util.StreamUtil; import org.dbflute.optional.OptionalEntity; import org.dbflute.optional.OptionalThing; import org.elasticsearch.common.unit.Fuzziness; @@ -678,7 +679,7 @@ public class QueryHelper implements Serializable { } public Stream highlightedFields() { - return Stream.of(highlightedFields); + return StreamUtil.of(highlightedFields); } /** @@ -812,7 +813,7 @@ public class QueryHelper implements Serializable { public void addDefaultSort(final String fieldName, final String order) { final List list = new ArrayList<>(); if (defaultSortBuilders != null) { - Stream.of(defaultSortBuilders).forEach(builder -> list.add(builder)); + StreamUtil.of(defaultSortBuilders).forEach(builder -> list.add(builder)); } list.add(SortBuilders.fieldSort(fieldName).order(SortOrder.ASC.toString().equalsIgnoreCase(order) ? SortOrder.ASC : SortOrder.DESC)); defaultSortBuilders = list.toArray(new SortBuilder[list.size()]); diff --git a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java index 21f6ea5bf..3ba0a1f2a 100644 --- a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.stream.Stream; import javax.annotation.PostConstruct; import javax.annotation.Resource; @@ -43,6 +42,7 @@ import org.codelibs.fess.es.log.exentity.SearchLog; import org.codelibs.fess.es.log.exentity.UserInfo; import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.util.DocumentUtil; +import org.codelibs.fess.util.StreamUtil; import org.elasticsearch.action.update.UpdateRequest; import org.lastaflute.di.core.SingletonLaContainer; import org.slf4j.Logger; @@ -150,7 +150,7 @@ public class SearchLogHelper { final Map userInfoMap = new HashMap<>(); queue.stream().forEach(searchLog -> { final String userAgent = searchLog.getUserAgent(); - final boolean isBot = userAgent != null && Stream.of(botNames).anyMatch(botName -> userAgent.indexOf(botName) >= 0); + final boolean isBot = userAgent != null && StreamUtil.of(botNames).anyMatch(botName -> userAgent.indexOf(botName) >= 0); if (!isBot) { searchLog.getUserInfo().ifPresent(userInfo -> { final String code = userInfo.getCode(); diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessUserBean.java b/src/main/java/org/codelibs/fess/mylasta/action/FessUserBean.java index 4f214fd58..ef9cb6d81 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessUserBean.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessUserBean.java @@ -15,9 +15,8 @@ */ package org.codelibs.fess.mylasta.action; -import java.util.stream.Stream; - import org.codelibs.fess.es.user.exentity.User; +import org.codelibs.fess.util.StreamUtil; import org.lastaflute.web.login.TypicalUserBean; /** @@ -63,18 +62,18 @@ public class FessUserBean extends TypicalUserBean { // #change_it also L } public boolean hasRole(final String role) { - return Stream.of(user.getRoleNames()).anyMatch(s -> s.equals(role)); + return StreamUtil.of(user.getRoleNames()).anyMatch(s -> s.equals(role)); } public boolean hasRoles(final String[] acceptedRoles) { - return Stream.of(user.getRoleNames()).anyMatch(s1 -> Stream.of(acceptedRoles).anyMatch(s2 -> s2.equals(s1))); + return StreamUtil.of(user.getRoleNames()).anyMatch(s1 -> StreamUtil.of(acceptedRoles).anyMatch(s2 -> s2.equals(s1))); } public boolean hasGroup(final String group) { - return Stream.of(user.getGroupNames()).anyMatch(s -> s.equals(group)); + return StreamUtil.of(user.getGroupNames()).anyMatch(s -> s.equals(group)); } public boolean hasGroups(final String[] acceptedGroups) { - return Stream.of(user.getGroupNames()).anyMatch(s1 -> Stream.of(acceptedGroups).anyMatch(s2 -> s2.equals(s1))); + return StreamUtil.of(user.getGroupNames()).anyMatch(s1 -> StreamUtil.of(acceptedGroups).anyMatch(s2 -> s2.equals(s1))); } }