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

modify max fetch size

Browse source
This commit is contained in:
Shinsuke Sugaya 2015-12-11 06:28:14 +09:00
parent b6a278e6b0
commit 3dd6683deb
7 changed files with 75 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/org/codelibs/fess/app/service/GroupService.java
View file

@ -27,6 +27,7 @@ import org.codelibs.fess.app.pager.GroupPager;
import org.codelibs.fess.es.user.cbean.GroupCB;
import org.codelibs.fess.es.user.exbhv.GroupBhv;
import org.codelibs.fess.es.user.exentity.Group;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.optional.OptionalEntity;
@ -37,6 +38,9 @@ public class GroupService implements Serializable {
@Resource
protected GroupBhv groupBhv;
@Resource
protected FessConfig fessConfig;
public List<Group> getGroupList(final GroupPager groupPager) {
final PagingResultBean<Group> groupList = groupBhv.selectPage(cb -> {
@ -106,10 +110,10 @@ public class GroupService implements Serializable {
}
public List<Group> getAvailableGroupList(final Integer size) {
public List<Group> getAvailableGroupList() {
return groupBhv.selectList(cb -> {
cb.query().matchAll();
cb.paging(size, 1);
cb.paging(fessConfig.getPageGroupMaxFetchSizeAsInteger(), 1);
});
}

6
src/main/java/org/codelibs/fess/app/service/LabelTypeService.java
View file

@ -31,6 +31,7 @@ import org.codelibs.fess.es.config.exbhv.LabelTypeBhv;
import org.codelibs.fess.es.config.exentity.LabelToRole;
import org.codelibs.fess.es.config.exentity.LabelType;
import org.codelibs.fess.helper.LabelTypeHelper;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.dbflute.cbean.result.ListResultBean;
import org.dbflute.cbean.result.PagingResultBean;
@ -46,6 +47,9 @@ public class LabelTypeService implements Serializable {
@Resource
protected LabelTypeBhv labelTypeBhv;
@Resource
protected FessConfig fessConfig;
public LabelTypeService() {
super();
}
@ -113,6 +117,7 @@ public class LabelTypeService implements Serializable {
return labelTypeBhv.selectList(cb -> {
cb.query().addOrderBy_SortOrder_Asc();
cb.query().addOrderBy_Name_Asc();
cb.paging(fessConfig.getPageLabeltypeMaxFetchSizeAsInteger().intValue(), 1);
});
}
@ -120,6 +125,7 @@ public class LabelTypeService implements Serializable {
final ListResultBean<LabelType> labelTypeList = labelTypeBhv.selectList(cb -> {
cb.query().addOrderBy_SortOrder_Asc();
cb.query().addOrderBy_Name_Asc();
cb.paging(fessConfig.getPageLabeltypeMaxFetchSizeAsInteger().intValue(), 1);
});
return labelTypeList;

4
src/main/java/org/codelibs/fess/app/service/RoleService.java
View file

@ -110,10 +110,10 @@ public class RoleService implements Serializable {
}
public List<Role> getAvailableRoleList(final Integer size) {
public List<Role> getAvailableRoleList() {
return roleBhv.selectList(cb -> {
cb.query().matchAll();
cb.paging(size, 1);
cb.paging(fessConfig.getPageRoleMaxFetchSizeAsInteger(), 1);
});
}

5
src/main/java/org/codelibs/fess/app/service/RoleTypeService.java
View file

@ -27,6 +27,7 @@ import org.codelibs.fess.app.pager.RoleTypePager;
import org.codelibs.fess.es.config.cbean.RoleTypeCB;
import org.codelibs.fess.es.config.exbhv.RoleTypeBhv;
import org.codelibs.fess.es.config.exentity.RoleType;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.optional.OptionalEntity;
@ -37,6 +38,9 @@ public class RoleTypeService implements Serializable {
@Resource
protected RoleTypeBhv roleTypeBhv;
@Resource
protected FessConfig fessConfig;
public RoleTypeService() {
super();
}
@ -114,6 +118,7 @@ public class RoleTypeService implements Serializable {
return roleTypeBhv.selectList(cb -> {
cb.query().addOrderBy_SortOrder_Asc();
cb.query().addOrderBy_Name_Asc();
cb.paging(fessConfig.getPageRoletypeMaxFetchSizeAsInteger().intValue(), 1);
});
}

4
src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java
View file

@ -113,8 +113,8 @@ public class AdminUserAction extends FessAdminAction {
}
private void registerForms(final RenderData data) {
data.register("roleItems", roleService.getAvailableRoleList(fessConfig.getPageRoleMaxFetchSizeAsInteger()));
data.register("groupItems", groupService.getAvailableGroupList(fessConfig.getPageGroupMaxFetchSizeAsInteger()));
data.register("roleItems", roleService.getAvailableRoleList());
data.register("groupItems", groupService.getAvailableGroupList());
}
// ===================================================================================

52
src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
View file

@ -172,6 +172,12 @@ public interface FessConfig extends FessEnv {
/** The key of the configuration. e.g. 1000 */
String PAGE_KEYMATCH_MAX_FETCH_SIZE = "page.keymatch.max.fetch.size";
/** The key of the configuration. e.g. 1000 */
String PAGE_LABELTYPE_MAX_FETCH_SIZE = "page.labeltype.max.fetch.size";
/** The key of the configuration. e.g. 1000 */
String PAGE_ROLETYPE_MAX_FETCH_SIZE = "page.roletype.max.fetch.size";
/** The key of the configuration. e.g. 1000 */
String PAGE_ROLE_MAX_FETCH_SIZE = "page.role.max.fetch.size";
@ -789,6 +795,36 @@ public interface FessConfig extends FessEnv {
*/
Integer getPageKeymatchMaxFetchSizeAsInteger();
/**
* Get the value for the key 'page.labeltype.max.fetch.size'. <br>
* The value is, e.g. 1000 <br>
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
String getPageLabeltypeMaxFetchSize();
/**
* Get the value for the key 'page.labeltype.max.fetch.size' as {@link Integer}. <br>
* The value is, e.g. 1000 <br>
* @return The value of found property. (NotNull: if not found, exception but basically no way)
* @throws NumberFormatException When the property is not integer.
*/
Integer getPageLabeltypeMaxFetchSizeAsInteger();
/**
* Get the value for the key 'page.roletype.max.fetch.size'. <br>
* The value is, e.g. 1000 <br>
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
String getPageRoletypeMaxFetchSize();
/**
* Get the value for the key 'page.roletype.max.fetch.size' as {@link Integer}. <br>
* The value is, e.g. 1000 <br>
* @return The value of found property. (NotNull: if not found, exception but basically no way)
* @throws NumberFormatException When the property is not integer.
*/
Integer getPageRoletypeMaxFetchSizeAsInteger();
/**
* Get the value for the key 'page.role.max.fetch.size'. <br>
* The value is, e.g. 1000 <br>
@ -1371,6 +1407,22 @@ public interface FessConfig extends FessEnv {
return getAsInteger(FessConfig.PAGE_KEYMATCH_MAX_FETCH_SIZE);
}
public String getPageLabeltypeMaxFetchSize() {
return get(FessConfig.PAGE_LABELTYPE_MAX_FETCH_SIZE);
}
public Integer getPageLabeltypeMaxFetchSizeAsInteger() {
return getAsInteger(FessConfig.PAGE_LABELTYPE_MAX_FETCH_SIZE);
}
public String getPageRoletypeMaxFetchSize() {
return get(FessConfig.PAGE_ROLETYPE_MAX_FETCH_SIZE);
}
public Integer getPageRoletypeMaxFetchSizeAsInteger() {
return getAsInteger(FessConfig.PAGE_ROLETYPE_MAX_FETCH_SIZE);
}
public String getPageRoleMaxFetchSize() {
return get(FessConfig.PAGE_ROLE_MAX_FETCH_SIZE);
}

2
src/main/resources/fess_config.properties
View file

@ -103,6 +103,8 @@ paging.page.range.fill.limit = true
# max page size
page.docboost.max.fetch.size=1000
page.keymatch.max.fetch.size=1000
page.labeltype.max.fetch.size=1000
page.roletype.max.fetch.size=1000
page.role.max.fetch.size=1000
page.group.max.fetch.size=1000