diff --git a/src/main/java/org/codelibs/fess/Constants.java b/src/main/java/org/codelibs/fess/Constants.java index 1c555cc91..9d89ce10f 100644 --- a/src/main/java/org/codelibs/fess/Constants.java +++ b/src/main/java/org/codelibs/fess/Constants.java @@ -32,8 +32,6 @@ public class Constants extends CoreLibConstants { public static final int DEFAULT_ADMIN_PAGE_NUMBER = 1; - public static final int DEFAULT_ADMIN_PAGE_SIZE = 25; - public static final String WEB_API_VERSION = FESS_VERSION; public static final String TRUE = "true"; diff --git a/src/main/java/org/codelibs/fess/app/pager/AccessTokenPager.java b/src/main/java/org/codelibs/fess/app/pager/AccessTokenPager.java index b4a0c843b..8c9bc749b 100644 --- a/src/main/java/org/codelibs/fess/app/pager/AccessTokenPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/AccessTokenPager.java @@ -19,6 +19,7 @@ import java.io.Serializable; import java.util.List; import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class AccessTokenPager implements Serializable { private static final long serialVersionUID = 1L; @@ -132,7 +133,7 @@ public class AccessTokenPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } } diff --git a/src/main/java/org/codelibs/fess/app/pager/BadWordPager.java b/src/main/java/org/codelibs/fess/app/pager/BadWordPager.java index 288ac14ec..4a6624a96 100644 --- a/src/main/java/org/codelibs/fess/app/pager/BadWordPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/BadWordPager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class BadWordPager implements Serializable { @@ -135,7 +135,7 @@ public class BadWordPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } } diff --git a/src/main/java/org/codelibs/fess/app/pager/BoostDocPager.java b/src/main/java/org/codelibs/fess/app/pager/BoostDocPager.java index c172430f3..02d70a191 100644 --- a/src/main/java/org/codelibs/fess/app/pager/BoostDocPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/BoostDocPager.java @@ -19,6 +19,7 @@ import java.io.Serializable; import java.util.List; import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class BoostDocPager implements Serializable { private static final long serialVersionUID = 1L; @@ -138,7 +139,7 @@ public class BoostDocPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } } diff --git a/src/main/java/org/codelibs/fess/app/pager/CharMappingPager.java b/src/main/java/org/codelibs/fess/app/pager/CharMappingPager.java index ebfda01b8..056383382 100644 --- a/src/main/java/org/codelibs/fess/app/pager/CharMappingPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/CharMappingPager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class CharMappingPager implements Serializable { @@ -52,7 +52,7 @@ public class CharMappingPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } protected int getDefaultCurrentPageNumber() { diff --git a/src/main/java/org/codelibs/fess/app/pager/CrawlingInfoPager.java b/src/main/java/org/codelibs/fess/app/pager/CrawlingInfoPager.java index 42fdc0321..499d02af7 100644 --- a/src/main/java/org/codelibs/fess/app/pager/CrawlingInfoPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/CrawlingInfoPager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class CrawlingInfoPager implements Serializable { @@ -129,7 +129,7 @@ public class CrawlingInfoPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } } diff --git a/src/main/java/org/codelibs/fess/app/pager/DataConfigPager.java b/src/main/java/org/codelibs/fess/app/pager/DataConfigPager.java index e2afecf02..c11f48273 100644 --- a/src/main/java/org/codelibs/fess/app/pager/DataConfigPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/DataConfigPager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class DataConfigPager implements Serializable { @@ -147,7 +147,7 @@ public class DataConfigPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } } diff --git a/src/main/java/org/codelibs/fess/app/pager/DuplicateHostPager.java b/src/main/java/org/codelibs/fess/app/pager/DuplicateHostPager.java index 88e004ed4..7c6c93a4d 100644 --- a/src/main/java/org/codelibs/fess/app/pager/DuplicateHostPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/DuplicateHostPager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class DuplicateHostPager implements Serializable { @@ -141,7 +141,7 @@ public class DuplicateHostPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } } diff --git a/src/main/java/org/codelibs/fess/app/pager/ElevateWordPager.java b/src/main/java/org/codelibs/fess/app/pager/ElevateWordPager.java index babe62c3e..cd16f58e6 100644 --- a/src/main/java/org/codelibs/fess/app/pager/ElevateWordPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/ElevateWordPager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class ElevateWordPager implements Serializable { @@ -138,7 +138,7 @@ public class ElevateWordPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } } diff --git a/src/main/java/org/codelibs/fess/app/pager/FailureUrlPager.java b/src/main/java/org/codelibs/fess/app/pager/FailureUrlPager.java index d34faf5f7..e567d8cbe 100644 --- a/src/main/java/org/codelibs/fess/app/pager/FailureUrlPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/FailureUrlPager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class FailureUrlPager implements Serializable { @@ -148,7 +148,7 @@ public class FailureUrlPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } } diff --git a/src/main/java/org/codelibs/fess/app/pager/FileAuthPager.java b/src/main/java/org/codelibs/fess/app/pager/FileAuthPager.java index 9c5599521..353996d6d 100644 --- a/src/main/java/org/codelibs/fess/app/pager/FileAuthPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/FileAuthPager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class FileAuthPager implements Serializable { @@ -141,7 +141,7 @@ public class FileAuthPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } } diff --git a/src/main/java/org/codelibs/fess/app/pager/FileConfigPager.java b/src/main/java/org/codelibs/fess/app/pager/FileConfigPager.java index 7d97ee6f1..149e311cb 100644 --- a/src/main/java/org/codelibs/fess/app/pager/FileConfigPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/FileConfigPager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class FileConfigPager implements Serializable { @@ -153,7 +153,7 @@ public class FileConfigPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } } diff --git a/src/main/java/org/codelibs/fess/app/pager/GroupPager.java b/src/main/java/org/codelibs/fess/app/pager/GroupPager.java index ad3b3ffd6..16cc97789 100644 --- a/src/main/java/org/codelibs/fess/app/pager/GroupPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/GroupPager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class GroupPager implements Serializable { @@ -129,7 +129,7 @@ public class GroupPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } } diff --git a/src/main/java/org/codelibs/fess/app/pager/JobLogPager.java b/src/main/java/org/codelibs/fess/app/pager/JobLogPager.java index e12bcb890..9bf62dde7 100644 --- a/src/main/java/org/codelibs/fess/app/pager/JobLogPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/JobLogPager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class JobLogPager implements Serializable { @@ -138,7 +138,7 @@ public class JobLogPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } } diff --git a/src/main/java/org/codelibs/fess/app/pager/KeyMatchPager.java b/src/main/java/org/codelibs/fess/app/pager/KeyMatchPager.java index 474d97f1b..6bb7dea19 100644 --- a/src/main/java/org/codelibs/fess/app/pager/KeyMatchPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/KeyMatchPager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class KeyMatchPager implements Serializable { @@ -144,7 +144,7 @@ public class KeyMatchPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } } diff --git a/src/main/java/org/codelibs/fess/app/pager/KuromojiPager.java b/src/main/java/org/codelibs/fess/app/pager/KuromojiPager.java index b9f59324a..87dab859a 100644 --- a/src/main/java/org/codelibs/fess/app/pager/KuromojiPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/KuromojiPager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class KuromojiPager implements Serializable { @@ -52,7 +52,7 @@ public class KuromojiPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } protected int getDefaultCurrentPageNumber() { diff --git a/src/main/java/org/codelibs/fess/app/pager/LabelTypePager.java b/src/main/java/org/codelibs/fess/app/pager/LabelTypePager.java index 3c718d58b..a92eed3b6 100644 --- a/src/main/java/org/codelibs/fess/app/pager/LabelTypePager.java +++ b/src/main/java/org/codelibs/fess/app/pager/LabelTypePager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class LabelTypePager implements Serializable { @@ -141,7 +141,7 @@ public class LabelTypePager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } } diff --git a/src/main/java/org/codelibs/fess/app/pager/PathMapPager.java b/src/main/java/org/codelibs/fess/app/pager/PathMapPager.java index 882a94b1b..0b9a1e523 100644 --- a/src/main/java/org/codelibs/fess/app/pager/PathMapPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/PathMapPager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class PathMapPager implements Serializable { @@ -144,7 +144,7 @@ public class PathMapPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } } diff --git a/src/main/java/org/codelibs/fess/app/pager/ProtwordsPager.java b/src/main/java/org/codelibs/fess/app/pager/ProtwordsPager.java index 082bc4df9..d66188bc8 100644 --- a/src/main/java/org/codelibs/fess/app/pager/ProtwordsPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/ProtwordsPager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class ProtwordsPager implements Serializable { @@ -52,7 +52,7 @@ public class ProtwordsPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } protected int getDefaultCurrentPageNumber() { diff --git a/src/main/java/org/codelibs/fess/app/pager/ReqHeaderPager.java b/src/main/java/org/codelibs/fess/app/pager/ReqHeaderPager.java index 88574c1ca..c35845d67 100644 --- a/src/main/java/org/codelibs/fess/app/pager/ReqHeaderPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/ReqHeaderPager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class ReqHeaderPager implements Serializable { @@ -141,7 +141,7 @@ public class ReqHeaderPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } } diff --git a/src/main/java/org/codelibs/fess/app/pager/RolePager.java b/src/main/java/org/codelibs/fess/app/pager/RolePager.java index 38940796e..908811366 100644 --- a/src/main/java/org/codelibs/fess/app/pager/RolePager.java +++ b/src/main/java/org/codelibs/fess/app/pager/RolePager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class RolePager implements Serializable { @@ -129,7 +129,7 @@ public class RolePager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } } diff --git a/src/main/java/org/codelibs/fess/app/pager/RoleTypePager.java b/src/main/java/org/codelibs/fess/app/pager/RoleTypePager.java index bf09bcb15..6042ad056 100644 --- a/src/main/java/org/codelibs/fess/app/pager/RoleTypePager.java +++ b/src/main/java/org/codelibs/fess/app/pager/RoleTypePager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class RoleTypePager implements Serializable { @@ -141,7 +141,7 @@ public class RoleTypePager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } } diff --git a/src/main/java/org/codelibs/fess/app/pager/SchedulerPager.java b/src/main/java/org/codelibs/fess/app/pager/SchedulerPager.java index 6f6584913..7d123c9dc 100644 --- a/src/main/java/org/codelibs/fess/app/pager/SchedulerPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/SchedulerPager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class SchedulerPager implements Serializable { @@ -156,7 +156,7 @@ public class SchedulerPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } } diff --git a/src/main/java/org/codelibs/fess/app/pager/SeunjeonPager.java b/src/main/java/org/codelibs/fess/app/pager/SeunjeonPager.java index 52916454d..481438ec9 100644 --- a/src/main/java/org/codelibs/fess/app/pager/SeunjeonPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/SeunjeonPager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class SeunjeonPager implements Serializable { @@ -52,7 +52,7 @@ public class SeunjeonPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } protected int getDefaultCurrentPageNumber() { diff --git a/src/main/java/org/codelibs/fess/app/pager/SynonymPager.java b/src/main/java/org/codelibs/fess/app/pager/SynonymPager.java index c1220d9ba..b9a0cd45a 100644 --- a/src/main/java/org/codelibs/fess/app/pager/SynonymPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/SynonymPager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class SynonymPager implements Serializable { @@ -52,7 +52,7 @@ public class SynonymPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } protected int getDefaultCurrentPageNumber() { diff --git a/src/main/java/org/codelibs/fess/app/pager/UserPager.java b/src/main/java/org/codelibs/fess/app/pager/UserPager.java index ca8f49300..4f62262de 100644 --- a/src/main/java/org/codelibs/fess/app/pager/UserPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/UserPager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class UserPager implements Serializable { @@ -134,7 +134,7 @@ public class UserPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } } diff --git a/src/main/java/org/codelibs/fess/app/pager/WebAuthPager.java b/src/main/java/org/codelibs/fess/app/pager/WebAuthPager.java index 8f96fd881..cb7e11395 100644 --- a/src/main/java/org/codelibs/fess/app/pager/WebAuthPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/WebAuthPager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class WebAuthPager implements Serializable { @@ -141,7 +141,7 @@ public class WebAuthPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } } diff --git a/src/main/java/org/codelibs/fess/app/pager/WebConfigPager.java b/src/main/java/org/codelibs/fess/app/pager/WebConfigPager.java index e365b0dba..30d52bfb5 100644 --- a/src/main/java/org/codelibs/fess/app/pager/WebConfigPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/WebConfigPager.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager; import java.io.Serializable; import java.util.List; -import org.codelibs.fess.Constants; +import org.codelibs.fess.util.ComponentUtil; public class WebConfigPager implements Serializable { @@ -156,7 +156,7 @@ public class WebConfigPager implements Serializable { } protected int getDefaultPageSize() { - return Constants.DEFAULT_ADMIN_PAGE_SIZE; + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } } diff --git a/src/main/java/org/codelibs/fess/app/service/AccessTokenService.java b/src/main/java/org/codelibs/fess/app/service/AccessTokenService.java index b08b0154a..14c483c66 100644 --- a/src/main/java/org/codelibs/fess/app/service/AccessTokenService.java +++ b/src/main/java/org/codelibs/fess/app/service/AccessTokenService.java @@ -46,7 +46,8 @@ public class AccessTokenService { // update pager BeanUtil.copyBeanToBean(accessTokenList, accessTokenPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); - accessTokenPager.setPageNumberList(accessTokenList.pageRange(op -> op.rangeSize(5)).createPageNumberList()); + accessTokenPager.setPageNumberList(accessTokenList.pageRange(op -> op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger())) + .createPageNumberList()); return accessTokenList; } diff --git a/src/main/java/org/codelibs/fess/app/service/BadWordService.java b/src/main/java/org/codelibs/fess/app/service/BadWordService.java index 97930cdeb..9c08a2979 100644 --- a/src/main/java/org/codelibs/fess/app/service/BadWordService.java +++ b/src/main/java/org/codelibs/fess/app/service/BadWordService.java @@ -31,6 +31,7 @@ import org.codelibs.fess.es.client.FessEsClient; import org.codelibs.fess.es.config.cbean.BadWordCB; import org.codelibs.fess.es.config.exbhv.BadWordBhv; import org.codelibs.fess.es.config.exentity.BadWord; +import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.util.ComponentUtil; import org.dbflute.bhv.readable.EntityRowHandler; import org.dbflute.cbean.result.PagingResultBean; @@ -54,6 +55,9 @@ public class BadWordService { @Resource protected FessEsClient fessEsClient; + @Resource + protected FessConfig fessConfig; + public List getBadWordList(final BadWordPager badWordPager) { final PagingResultBean badWordList = badWordBhv.selectPage(cb -> { @@ -63,7 +67,8 @@ public class BadWordService { // update pager BeanUtil.copyBeanToBean(badWordList, badWordPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); - badWordPager.setPageNumberList(badWordList.pageRange(op -> op.rangeSize(5)).createPageNumberList()); + badWordPager.setPageNumberList(badWordList.pageRange(op -> op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger())) + .createPageNumberList()); return badWordList; } diff --git a/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java b/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java index 8af5e18a2..7b2aae101 100644 --- a/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java +++ b/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java @@ -46,7 +46,8 @@ public class BoostDocumentRuleService { // update pager BeanUtil.copyBeanToBean(boostDocumentRuleList, boostDocumentRulePager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); - boostDocumentRulePager.setPageNumberList(boostDocumentRuleList.pageRange(op -> op.rangeSize(5)).createPageNumberList()); + boostDocumentRulePager.setPageNumberList(boostDocumentRuleList.pageRange( + op -> op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger())).createPageNumberList()); return boostDocumentRuleList; } diff --git a/src/main/java/org/codelibs/fess/app/service/CharMappingService.java b/src/main/java/org/codelibs/fess/app/service/CharMappingService.java index 6996571aa..2a38b0c22 100644 --- a/src/main/java/org/codelibs/fess/app/service/CharMappingService.java +++ b/src/main/java/org/codelibs/fess/app/service/CharMappingService.java @@ -27,12 +27,16 @@ import org.codelibs.fess.dict.DictionaryFile.PagingList; import org.codelibs.fess.dict.DictionaryManager; import org.codelibs.fess.dict.mapping.CharMappingFile; import org.codelibs.fess.dict.mapping.CharMappingItem; +import org.codelibs.fess.mylasta.direction.FessConfig; import org.dbflute.optional.OptionalEntity; public class CharMappingService { @Resource protected DictionaryManager dictionaryManager; + @Resource + protected FessConfig fessConfig; + public List getCharMappingList(final String dictId, final CharMappingPager charMappingPager) { return getCharMappingFile(dictId).map( file -> { @@ -42,7 +46,7 @@ public class CharMappingService { // update pager BeanUtil.copyBeanToBean(charMappingList, charMappingPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); - charMappingList.setPageRangeSize(5); + charMappingList.setPageRangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); charMappingPager.setPageNumberList(charMappingList.createPageNumberList()); return (List) charMappingList; diff --git a/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java b/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java index 09588ddc1..e68f2a21d 100644 --- a/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java +++ b/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java @@ -76,7 +76,8 @@ public class CrawlingInfoService { // update pager BeanUtil.copyBeanToBean(crawlingInfoList, crawlingInfoPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); - crawlingInfoPager.setPageNumberList(crawlingInfoList.pageRange(op -> op.rangeSize(5)).createPageNumberList()); + crawlingInfoPager.setPageNumberList(crawlingInfoList.pageRange(op -> op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger())) + .createPageNumberList()); return crawlingInfoList; } diff --git a/src/main/java/org/codelibs/fess/app/service/DataConfigService.java b/src/main/java/org/codelibs/fess/app/service/DataConfigService.java index 3f9471384..b73fa4934 100644 --- a/src/main/java/org/codelibs/fess/app/service/DataConfigService.java +++ b/src/main/java/org/codelibs/fess/app/service/DataConfigService.java @@ -54,7 +54,7 @@ public class DataConfigService { // update pager BeanUtil.copyBeanToBean(dataConfigList, dataConfigPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); dataConfigPager.setPageNumberList(dataConfigList.pageRange(op -> { - op.rangeSize(5); + op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); }).createPageNumberList()); return dataConfigList; diff --git a/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java b/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java index 743063137..5413751d3 100644 --- a/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java +++ b/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java @@ -47,7 +47,7 @@ public class DuplicateHostService { // update pager BeanUtil.copyBeanToBean(duplicateHostList, duplicateHostPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); duplicateHostPager.setPageNumberList(duplicateHostList.pageRange(op -> { - op.rangeSize(5); + op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); }).createPageNumberList()); return duplicateHostList; diff --git a/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java b/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java index 60811a27d..6b8189f3e 100644 --- a/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java +++ b/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java @@ -76,7 +76,7 @@ public class ElevateWordService { // update pager BeanUtil.copyBeanToBean(elevateWordList, elevateWordPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); elevateWordPager.setPageNumberList(elevateWordList.pageRange(op -> { - op.rangeSize(5); + op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); }).createPageNumberList()); return elevateWordList; diff --git a/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java b/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java index e42a0bd7a..93345b238 100644 --- a/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java +++ b/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java @@ -59,7 +59,7 @@ public class FailureUrlService { // update pager BeanUtil.copyBeanToBean(failureUrlList, failureUrlPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); failureUrlPager.setPageNumberList(failureUrlList.pageRange(op -> { - op.rangeSize(5); + op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); }).createPageNumberList()); return failureUrlList; diff --git a/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java b/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java index 01fa87e67..7d7834eb0 100644 --- a/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java +++ b/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java @@ -47,7 +47,7 @@ public class FileAuthenticationService { // update pager BeanUtil.copyBeanToBean(fileAuthenticationList, fileAuthenticationPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); fileAuthenticationPager.setPageNumberList(fileAuthenticationList.pageRange(op -> { - op.rangeSize(5); + op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); }).createPageNumberList()); return fileAuthenticationList; diff --git a/src/main/java/org/codelibs/fess/app/service/FileConfigService.java b/src/main/java/org/codelibs/fess/app/service/FileConfigService.java index defb4ec39..b1ec28b6a 100644 --- a/src/main/java/org/codelibs/fess/app/service/FileConfigService.java +++ b/src/main/java/org/codelibs/fess/app/service/FileConfigService.java @@ -57,7 +57,7 @@ public class FileConfigService { // update pager BeanUtil.copyBeanToBean(fileConfigList, fileConfigPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); fileConfigPager.setPageNumberList(fileConfigList.pageRange(op -> { - op.rangeSize(5); + op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); }).createPageNumberList()); return fileConfigList; diff --git a/src/main/java/org/codelibs/fess/app/service/GroupService.java b/src/main/java/org/codelibs/fess/app/service/GroupService.java index 94d67a96c..da65f858a 100644 --- a/src/main/java/org/codelibs/fess/app/service/GroupService.java +++ b/src/main/java/org/codelibs/fess/app/service/GroupService.java @@ -54,7 +54,7 @@ public class GroupService { // update pager BeanUtil.copyBeanToBean(groupList, groupPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); groupPager.setPageNumberList(groupList.pageRange(op -> { - op.rangeSize(5); + op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); }).createPageNumberList()); return groupList; diff --git a/src/main/java/org/codelibs/fess/app/service/JobLogService.java b/src/main/java/org/codelibs/fess/app/service/JobLogService.java index b8407865e..4b9b6c75d 100644 --- a/src/main/java/org/codelibs/fess/app/service/JobLogService.java +++ b/src/main/java/org/codelibs/fess/app/service/JobLogService.java @@ -25,6 +25,7 @@ import org.codelibs.fess.app.pager.JobLogPager; import org.codelibs.fess.es.config.cbean.JobLogCB; import org.codelibs.fess.es.config.exbhv.JobLogBhv; import org.codelibs.fess.es.config.exentity.JobLog; +import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.util.ComponentUtil; import org.dbflute.cbean.result.PagingResultBean; import org.dbflute.optional.OptionalEntity; @@ -34,6 +35,9 @@ public class JobLogService { @Resource protected JobLogBhv jobLogBhv; + @Resource + protected FessConfig fessConfig; + protected long expiredJobInterval = 2 * 60 * 60 * 1000L; // 2hours public List getJobLogList(final JobLogPager jobLogPager) { @@ -46,7 +50,7 @@ public class JobLogService { // update pager BeanUtil.copyBeanToBean(jobLogList, jobLogPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); jobLogPager.setPageNumberList(jobLogList.pageRange(op -> { - op.rangeSize(5); + op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); }).createPageNumberList()); return jobLogList; diff --git a/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java b/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java index 2bb476500..9c6b8ad74 100644 --- a/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java +++ b/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java @@ -47,7 +47,7 @@ public class KeyMatchService { // update pager BeanUtil.copyBeanToBean(keyMatchList, keyMatchPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); keyMatchPager.setPageNumberList(keyMatchList.pageRange(op -> { - op.rangeSize(5); + op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); }).createPageNumberList()); return keyMatchList; diff --git a/src/main/java/org/codelibs/fess/app/service/KuromojiService.java b/src/main/java/org/codelibs/fess/app/service/KuromojiService.java index 1bb3121b4..af1fb18dc 100644 --- a/src/main/java/org/codelibs/fess/app/service/KuromojiService.java +++ b/src/main/java/org/codelibs/fess/app/service/KuromojiService.java @@ -27,12 +27,16 @@ import org.codelibs.fess.dict.DictionaryFile.PagingList; import org.codelibs.fess.dict.DictionaryManager; import org.codelibs.fess.dict.kuromoji.KuromojiFile; import org.codelibs.fess.dict.kuromoji.KuromojiItem; +import org.codelibs.fess.mylasta.direction.FessConfig; import org.dbflute.optional.OptionalEntity; public class KuromojiService { @Resource protected DictionaryManager dictionaryManager; + @Resource + protected FessConfig fessConfig; + public List getKuromojiList(final String dictId, final KuromojiPager kuromojiPager) { return getKuromojiFile(dictId).map(file -> { final int pageSize = kuromojiPager.getPageSize(); @@ -40,7 +44,7 @@ public class KuromojiService { // update pager BeanUtil.copyBeanToBean(kuromojiList, kuromojiPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); - kuromojiList.setPageRangeSize(5); + kuromojiList.setPageRangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); kuromojiPager.setPageNumberList(kuromojiList.createPageNumberList()); return (List) kuromojiList; diff --git a/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java b/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java index 7723276b7..6925bbed7 100644 --- a/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java +++ b/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java @@ -49,7 +49,7 @@ public class LabelTypeService { // update pager BeanUtil.copyBeanToBean(labelTypeList, labelTypePager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); labelTypePager.setPageNumberList(labelTypeList.pageRange(op -> { - op.rangeSize(5); + op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); }).createPageNumberList()); return labelTypeList; diff --git a/src/main/java/org/codelibs/fess/app/service/PathMappingService.java b/src/main/java/org/codelibs/fess/app/service/PathMappingService.java index e52291e78..117f93931 100644 --- a/src/main/java/org/codelibs/fess/app/service/PathMappingService.java +++ b/src/main/java/org/codelibs/fess/app/service/PathMappingService.java @@ -49,7 +49,7 @@ public class PathMappingService { // update pager BeanUtil.copyBeanToBean(pathMappingList, pathMappingPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); pathMappingPager.setPageNumberList(pathMappingList.pageRange(op -> { - op.rangeSize(5); + op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); }).createPageNumberList()); return pathMappingList; diff --git a/src/main/java/org/codelibs/fess/app/service/ProtwordsService.java b/src/main/java/org/codelibs/fess/app/service/ProtwordsService.java index 0466ffa6c..ee0b26e37 100644 --- a/src/main/java/org/codelibs/fess/app/service/ProtwordsService.java +++ b/src/main/java/org/codelibs/fess/app/service/ProtwordsService.java @@ -27,12 +27,16 @@ import org.codelibs.fess.dict.DictionaryFile.PagingList; import org.codelibs.fess.dict.DictionaryManager; import org.codelibs.fess.dict.protwords.ProtwordsFile; import org.codelibs.fess.dict.protwords.ProtwordsItem; +import org.codelibs.fess.mylasta.direction.FessConfig; import org.dbflute.optional.OptionalEntity; public class ProtwordsService { @Resource protected DictionaryManager dictionaryManager; + @Resource + protected FessConfig fessConfig; + public List getProtwordsList(final String dictId, final ProtwordsPager protwordsPager) { return getProtwordsFile(dictId).map( file -> { @@ -42,7 +46,7 @@ public class ProtwordsService { // update pager BeanUtil.copyBeanToBean(protwordsList, protwordsPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); - protwordsList.setPageRangeSize(5); + protwordsList.setPageRangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); protwordsPager.setPageNumberList(protwordsList.createPageNumberList()); return (List) protwordsList; diff --git a/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java b/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java index 1c3b9be2b..f932b49f6 100644 --- a/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java +++ b/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java @@ -47,7 +47,7 @@ public class RequestHeaderService { // update pager BeanUtil.copyBeanToBean(requestHeaderList, requestHeaderPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); requestHeaderPager.setPageNumberList(requestHeaderList.pageRange(op -> { - op.rangeSize(5); + op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); }).createPageNumberList()); return requestHeaderList; diff --git a/src/main/java/org/codelibs/fess/app/service/RoleService.java b/src/main/java/org/codelibs/fess/app/service/RoleService.java index 0903f977d..93ba6d3cf 100644 --- a/src/main/java/org/codelibs/fess/app/service/RoleService.java +++ b/src/main/java/org/codelibs/fess/app/service/RoleService.java @@ -54,7 +54,7 @@ public class RoleService { // update pager BeanUtil.copyBeanToBean(roleList, rolePager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); rolePager.setPageNumberList(roleList.pageRange(op -> { - op.rangeSize(5); + op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); }).createPageNumberList()); return roleList; diff --git a/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java b/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java index 2c7bd22c6..1de3630c0 100644 --- a/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java +++ b/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java @@ -47,7 +47,7 @@ public class RoleTypeService { // update pager BeanUtil.copyBeanToBean(roleTypeList, roleTypePager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); roleTypePager.setPageNumberList(roleTypeList.pageRange(op -> { - op.rangeSize(5); + op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); }).createPageNumberList()); return roleTypeList; diff --git a/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java b/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java index 250c40c59..0cd51fef4 100644 --- a/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java +++ b/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java @@ -53,7 +53,7 @@ public class ScheduledJobService { // update pager BeanUtil.copyBeanToBean(scheduledJobList, scheduledJobPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); scheduledJobPager.setPageNumberList(scheduledJobList.pageRange(op -> { - op.rangeSize(5); + op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); }).createPageNumberList()); return scheduledJobList; diff --git a/src/main/java/org/codelibs/fess/app/service/SeunjeonService.java b/src/main/java/org/codelibs/fess/app/service/SeunjeonService.java index 40b4761fc..f96d8c4c3 100644 --- a/src/main/java/org/codelibs/fess/app/service/SeunjeonService.java +++ b/src/main/java/org/codelibs/fess/app/service/SeunjeonService.java @@ -27,12 +27,16 @@ import org.codelibs.fess.dict.DictionaryFile.PagingList; import org.codelibs.fess.dict.DictionaryManager; import org.codelibs.fess.dict.seunjeon.SeunjeonFile; import org.codelibs.fess.dict.seunjeon.SeunjeonItem; +import org.codelibs.fess.mylasta.direction.FessConfig; import org.dbflute.optional.OptionalEntity; public class SeunjeonService { @Resource protected DictionaryManager dictionaryManager; + @Resource + protected FessConfig fessConfig; + public List getSeunjeonList(final String dictId, final SeunjeonPager seunjeonPager) { return getSeunjeonFile(dictId).map(file -> { final int pageSize = seunjeonPager.getPageSize(); @@ -40,7 +44,7 @@ public class SeunjeonService { // update pager BeanUtil.copyBeanToBean(seunjeonList, seunjeonPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); - seunjeonList.setPageRangeSize(5); + seunjeonList.setPageRangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); seunjeonPager.setPageNumberList(seunjeonList.createPageNumberList()); return (List) seunjeonList; diff --git a/src/main/java/org/codelibs/fess/app/service/SynonymService.java b/src/main/java/org/codelibs/fess/app/service/SynonymService.java index c484244f7..69df569ce 100644 --- a/src/main/java/org/codelibs/fess/app/service/SynonymService.java +++ b/src/main/java/org/codelibs/fess/app/service/SynonymService.java @@ -27,12 +27,16 @@ import org.codelibs.fess.dict.DictionaryFile.PagingList; import org.codelibs.fess.dict.DictionaryManager; import org.codelibs.fess.dict.synonym.SynonymFile; import org.codelibs.fess.dict.synonym.SynonymItem; +import org.codelibs.fess.mylasta.direction.FessConfig; import org.dbflute.optional.OptionalEntity; public class SynonymService { @Resource protected DictionaryManager dictionaryManager; + @Resource + protected FessConfig fessConfig; + public List getSynonymList(final String dictId, final SynonymPager synonymPager) { return getSynonymFile(dictId).map(file -> { final int pageSize = synonymPager.getPageSize(); @@ -40,7 +44,7 @@ public class SynonymService { // update pager BeanUtil.copyBeanToBean(synonymList, synonymPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); - synonymList.setPageRangeSize(5); + synonymList.setPageRangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); synonymPager.setPageNumberList(synonymList.createPageNumberList()); return (List) synonymList; diff --git a/src/main/java/org/codelibs/fess/app/service/UserService.java b/src/main/java/org/codelibs/fess/app/service/UserService.java index d4c4529b8..8b46ee04e 100644 --- a/src/main/java/org/codelibs/fess/app/service/UserService.java +++ b/src/main/java/org/codelibs/fess/app/service/UserService.java @@ -54,7 +54,7 @@ public class UserService { // update pager BeanUtil.copyBeanToBean(userList, userPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); userPager.setPageNumberList(userList.pageRange(op -> { - op.rangeSize(5); + op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); }).createPageNumberList()); return userList; diff --git a/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java b/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java index c2c8087bc..20e8eced2 100644 --- a/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java +++ b/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java @@ -47,7 +47,7 @@ public class WebAuthenticationService { // update pager BeanUtil.copyBeanToBean(webAuthenticationList, webAuthenticationPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); webAuthenticationPager.setPageNumberList(webAuthenticationList.pageRange(op -> { - op.rangeSize(5); + op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); }).createPageNumberList()); return webAuthenticationList; diff --git a/src/main/java/org/codelibs/fess/app/service/WebConfigService.java b/src/main/java/org/codelibs/fess/app/service/WebConfigService.java index 316ff819f..af723285e 100644 --- a/src/main/java/org/codelibs/fess/app/service/WebConfigService.java +++ b/src/main/java/org/codelibs/fess/app/service/WebConfigService.java @@ -61,7 +61,7 @@ public class WebConfigService { // update pager BeanUtil.copyBeanToBean(webConfigList, webConfigPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); webConfigPager.setPageNumberList(webConfigList.pageRange(op -> { - op.rangeSize(5); + op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()); }).createPageNumberList()); return webConfigList; diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties index 37bc3773a..ce61b876f 100644 --- a/src/main/resources/fess_config.properties +++ b/src/main/resources/fess_config.properties @@ -315,10 +315,10 @@ cookie.remember.me.harbor.key = FES # Paging # ------ # The size of one page for paging -paging.page.size = 4 +paging.page.size = 25 # The size of page range for paging -paging.page.range.size = 3 +paging.page.range.size = 5 # The option 'fillLimit' of page range for paging paging.page.range.fill.limit = true