0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace Stream.of with StreamUtil.of

Browse source
This commit is contained in:
Kaoru FUZITA 2015-11-12 13:11:43 +09:00
parent fc8596056f
commit 0e8b6a78c7
6 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/org/codelibs/fess/entity/QueryContext.java
View file

@ -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() {

6
src/main/java/org/codelibs/fess/es/user/exentity/User.java
View file

@ -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]);
}

4
src/main/java/org/codelibs/fess/exec/Crawler.java
View file

@ -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);

5
src/main/java/org/codelibs/fess/helper/QueryHelper.java
View file

@ -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<String> 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<SortBuilder> 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()]);

4
src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
View file

@ -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<String, UserInfo> 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();

11
src/main/java/org/codelibs/fess/mylasta/action/FessUserBean.java
View file

@ -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<String> { // #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)));
}
}