From 5456e87e39642ffb02a344c6fe8cf58659a761f5 Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@apache.org>
Date: Wed, 28 Oct 2020 06:55:51 +0900
Subject: [PATCH] update dependencies for maven plugins
---
pom.xml | 16 +-
.../java/org/codelibs/fess/Constants.java | 8 +-
.../codelibs/fess/api/es/EsApiManager.java | 4 +-
.../codelibs/fess/api/gsa/GsaApiManager.java | 7 +-
.../fess/api/json/JsonApiManager.java | 121 ++--
.../fess/api/suggest/SuggestApiManager.java | 4 +-
.../fess/app/job/AllJobScheduler.java | 4 +-
.../fess/app/service/AccessTokenService.java | 37 +-
.../fess/app/service/BadWordService.java | 4 +-
.../app/service/BoostDocumentRuleService.java | 4 +-
.../fess/app/service/CharMappingService.java | 21 +-
.../fess/app/service/CrawlingInfoService.java | 4 +-
.../fess/app/service/ElevateWordService.java | 72 +--
.../fess/app/service/GroupService.java | 12 +-
.../fess/app/service/KuromojiService.java | 10 +-
.../fess/app/service/ProtwordsService.java | 21 +-
.../app/service/RelatedContentService.java | 4 +-
.../fess/app/service/RelatedQueryService.java | 4 +-
.../fess/app/service/RoleService.java | 12 +-
.../app/service/StemmerOverrideService.java | 22 +-
.../fess/app/service/StopwordsService.java | 21 +-
.../fess/app/service/SynonymService.java | 10 +-
.../fess/app/web/admin/AdminAction.java | 2 +-
.../accesstoken/AdminAccesstokenAction.java | 150 ++---
.../web/admin/backup/AdminBackupAction.java | 175 +++---
.../web/admin/badword/AdminBadwordAction.java | 70 ++-
.../admin/boostdoc/AdminBoostdocAction.java | 64 +--
.../crawlinginfo/AdminCrawlinginfoAction.java | 2 +-
.../dataconfig/AdminDataconfigAction.java | 168 +++---
.../kuromoji/AdminDictKuromojiAction.java | 157 +++---
.../dict/mapping/AdminDictMappingAction.java | 158 +++---
.../protwords/AdminDictProtwordsAction.java | 109 ++--
.../AdminDictStemmeroverrideAction.java | 170 +++---
.../stopwords/AdminDictStopwordsAction.java | 109 ++--
.../dict/synonym/AdminDictSynonymAction.java | 161 +++---
.../AdminDuplicatehostAction.java | 66 +--
.../elevateword/AdminElevatewordAction.java | 153 +++--
.../failureurl/AdminFailureurlAction.java | 2 +-
.../admin/fileauth/AdminFileauthAction.java | 77 ++-
.../fileconfig/AdminFileconfigAction.java | 165 +++---
.../app/web/admin/group/AdminGroupAction.java | 72 ++-
.../web/admin/joblog/AdminJoblogAction.java | 2 +-
.../admin/keymatch/AdminKeymatchAction.java | 72 ++-
.../admin/labeltype/AdminLabeltypeAction.java | 155 +++--
.../maintenance/AdminMaintenanceAction.java | 48 +-
.../web/admin/pathmap/AdminPathmapAction.java | 66 +--
.../web/admin/plugin/AdminPluginAction.java | 7 +-
.../AdminRelatedcontentAction.java | 64 +--
.../relatedquery/AdminRelatedqueryAction.java | 141 ++---
.../admin/reqheader/AdminReqheaderAction.java | 70 ++-
.../app/web/admin/role/AdminRoleAction.java | 23 +-
.../admin/scheduler/AdminSchedulerAction.java | 112 ++--
.../searchlist/AdminSearchlistAction.java | 82 ++-
.../admin/searchlog/AdminSearchlogAction.java | 6 +-
.../web/admin/storage/AdminStorageAction.java | 40 +-
.../systeminfo/AdminSysteminfoAction.java | 6 +-
.../web/admin/upgrade/AdminUpgradeAction.java | 14 +-
.../app/web/admin/user/AdminUserAction.java | 72 ++-
.../web/admin/webauth/AdminWebauthAction.java | 70 ++-
.../admin/webconfig/AdminWebconfigAction.java | 174 +++---
.../codelibs/fess/app/web/api/ApiResult.java | 9 +-
.../ApiAdminAccesstokenAction.java | 6 +-
.../admin/backup/ApiAdminBackupAction.java | 13 +-
.../admin/badword/ApiAdminBadwordAction.java | 6 +-
.../dataconfig/ApiAdminDataconfigAction.java | 17 +-
.../api/admin/dict/ApiAdminDictAction.java | 3 +-
.../kuromoji/ApiAdminDictKuromojiAction.java | 13 +-
.../mapping/ApiAdminDictMappingAction.java | 13 +-
.../ApiAdminDictProtwordsAction.java | 13 +-
.../ApiAdminDictStemmeroverrideAction.java | 29 +-
.../ApiAdminDictStopwordsAction.java | 13 +-
.../synonym/ApiAdminDictSynonymAction.java | 13 +-
.../ApiAdminDuplicatehostAction.java | 6 +-
.../ApiAdminElevatewordAction.java | 22 +-
.../fileauth/ApiAdminFileauthAction.java | 6 +-
.../fileconfig/ApiAdminFileconfigAction.java | 17 +-
.../api/admin/group/ApiAdminGroupAction.java | 6 +-
.../keymatch/ApiAdminKeymatchAction.java | 6 +-
.../labeltype/ApiAdminLabeltypeAction.java | 12 +-
.../admin/pathmap/ApiAdminPathmapAction.java | 10 +-
.../admin/plugin/ApiAdminPluginAction.java | 3 +-
.../ApiAdminRelatedcontentAction.java | 10 +-
.../ApiAdminRelatedqueryAction.java | 6 +-
.../reqheader/ApiAdminReqheaderAction.java | 6 +-
.../api/admin/role/ApiAdminRoleAction.java | 6 +-
.../scheduler/ApiAdminSchedulerAction.java | 6 +-
.../searchlist/ApiAdminSearchlistAction.java | 8 +-
.../api/admin/user/ApiAdminUserAction.java | 6 +-
.../admin/webauth/ApiAdminWebauthAction.java | 6 +-
.../webconfig/ApiAdminWebconfigAction.java | 17 +-
.../fess/app/web/base/FessAdminAction.java | 5 +-
.../fess/app/web/base/FessSearchAction.java | 7 +-
.../fess/app/web/cache/CacheAction.java | 5 +-
.../codelibs/fess/app/web/go/GoAction.java | 5 +-
.../fess/app/web/profile/ProfileAction.java | 4 +-
.../fess/app/web/search/SearchAction.java | 67 +--
.../fess/crawler/FessCrawlerThread.java | 16 +-
.../AbstractFessFileTransformer.java | 119 ++--
.../transformer/FessXpathTransformer.java | 4 +-
.../codelibs/fess/dict/DictionaryManager.java | 57 +-
.../FileListIndexUpdateCallbackImpl.java | 4 +-
.../org/codelibs/fess/entity/FacetInfo.java | 5 +-
.../org/codelibs/fess/entity/GeoInfo.java | 71 ++-
.../codelibs/fess/es/client/FessEsClient.java | 398 ++++++-------
.../common/ImplementedInvokerAssistant.java | 8 +-
.../es/config/bsbhv/BsRelatedContentBhv.java | 3 +-
.../es/config/bsbhv/BsThumbnailQueueBhv.java | 3 +-
.../bsentity/dbmeta/AccessTokenDbm.java | 4 +-
.../bsentity/dbmeta/CrawlingInfoDbm.java | 8 +-
.../bsentity/dbmeta/CrawlingInfoParamDbm.java | 8 +-
.../config/bsentity/dbmeta/DataConfigDbm.java | 8 +-
.../bsentity/dbmeta/DuplicateHostDbm.java | 8 +-
.../bsentity/dbmeta/ElevateWordDbm.java | 8 +-
.../dbmeta/ElevateWordToLabelDbm.java | 4 +-
.../dbmeta/FileAuthenticationDbm.java | 4 +-
.../config/bsentity/dbmeta/FileConfigDbm.java | 20 +-
.../config/bsentity/dbmeta/KeyMatchDbm.java | 8 +-
.../config/bsentity/dbmeta/LabelTypeDbm.java | 20 +-
.../bsentity/dbmeta/PathMappingDbm.java | 12 +-
.../bsentity/dbmeta/RelatedContentDbm.java | 3 +-
.../bsentity/dbmeta/RelatedQueryDbm.java | 8 +-
.../bsentity/dbmeta/RequestHeaderDbm.java | 12 +-
.../config/bsentity/dbmeta/RoleTypeDbm.java | 4 +-
.../bsentity/dbmeta/ScheduledJobDbm.java | 16 +-
.../bsentity/dbmeta/ThumbnailQueueDbm.java | 3 +-
.../bsentity/dbmeta/WebAuthenticationDbm.java | 4 +-
.../config/bsentity/dbmeta/WebConfigDbm.java | 12 +-
.../config/cbean/ca/bs/BsAccessTokenCA.java | 30 +-
.../es/config/cbean/ca/bs/BsBadWordCA.java | 15 +-
.../cbean/ca/bs/BsBoostDocumentRuleCA.java | 48 +-
.../config/cbean/ca/bs/BsCrawlingInfoCA.java | 9 +-
.../cbean/ca/bs/BsCrawlingInfoParamCA.java | 12 +-
.../es/config/cbean/ca/bs/BsDataConfigCA.java | 27 +-
.../config/cbean/ca/bs/BsDuplicateHostCA.java | 27 +-
.../config/cbean/ca/bs/BsElevateWordCA.java | 15 +-
.../cbean/ca/bs/BsElevateWordToLabelCA.java | 6 +-
.../es/config/cbean/ca/bs/BsFailureUrlCA.java | 15 +-
.../cbean/ca/bs/BsFileAuthenticationCA.java | 42 +-
.../es/config/cbean/ca/bs/BsFileConfigCA.java | 63 ++-
.../es/config/cbean/ca/bs/BsJobLogCA.java | 36 +-
.../es/config/cbean/ca/bs/BsKeyMatchCA.java | 30 +-
.../es/config/cbean/ca/bs/BsLabelTypeCA.java | 21 +-
.../config/cbean/ca/bs/BsPathMappingCA.java | 21 +-
.../cbean/ca/bs/BsRelatedContentCA.java | 21 +-
.../config/cbean/ca/bs/BsRelatedQueryCA.java | 9 +-
.../config/cbean/ca/bs/BsRequestHeaderCA.java | 21 +-
.../es/config/cbean/ca/bs/BsRoleTypeCA.java | 30 +-
.../config/cbean/ca/bs/BsScheduledJobCA.java | 33 +-
.../cbean/ca/bs/BsThumbnailQueueCA.java | 12 +-
.../cbean/ca/bs/BsWebAuthenticationCA.java | 60 +-
.../es/config/cbean/ca/bs/BsWebConfigCA.java | 60 +-
.../config/cbean/cq/bs/BsAccessTokenCQ.java | 5 +-
.../es/config/cbean/cq/bs/BsBadWordCQ.java | 5 +-
.../cbean/cq/bs/BsBoostDocumentRuleCQ.java | 5 +-
.../config/cbean/cq/bs/BsCrawlingInfoCQ.java | 5 +-
.../cbean/cq/bs/BsCrawlingInfoParamCQ.java | 5 +-
.../es/config/cbean/cq/bs/BsDataConfigCQ.java | 11 +-
.../config/cbean/cq/bs/BsDuplicateHostCQ.java | 8 +-
.../config/cbean/cq/bs/BsElevateWordCQ.java | 5 +-
.../cbean/cq/bs/BsElevateWordToLabelCQ.java | 5 +-
.../es/config/cbean/cq/bs/BsFailureUrlCQ.java | 8 +-
.../cbean/cq/bs/BsFileAuthenticationCQ.java | 5 +-
.../es/config/cbean/cq/bs/BsFileConfigCQ.java | 14 +-
.../es/config/cbean/cq/bs/BsJobLogCQ.java | 5 +-
.../es/config/cbean/cq/bs/BsKeyMatchCQ.java | 5 +-
.../es/config/cbean/cq/bs/BsLabelTypeCQ.java | 5 +-
.../config/cbean/cq/bs/BsPathMappingCQ.java | 5 +-
.../cbean/cq/bs/BsRelatedContentCQ.java | 5 +-
.../config/cbean/cq/bs/BsRelatedQueryCQ.java | 5 +-
.../config/cbean/cq/bs/BsRequestHeaderCQ.java | 5 +-
.../es/config/cbean/cq/bs/BsRoleTypeCQ.java | 5 +-
.../config/cbean/cq/bs/BsScheduledJobCQ.java | 5 +-
.../cbean/cq/bs/BsThumbnailQueueCQ.java | 5 +-
.../cbean/cq/bs/BsWebAuthenticationCQ.java | 5 +-
.../es/config/cbean/cq/bs/BsWebConfigCQ.java | 5 +-
.../fess/es/config/exentity/DataConfig.java | 16 +-
.../fess/es/config/exentity/ScheduledJob.java | 8 +-
.../es/config/exentity/WebAuthentication.java | 4 +-
.../fess/es/config/exentity/WebConfig.java | 6 +-
.../es/log/bsentity/dbmeta/ClickLogDbm.java | 12 +-
.../log/bsentity/dbmeta/FavoriteLogDbm.java | 4 +-
.../es/log/bsentity/dbmeta/SearchLogDbm.java | 15 +-
.../fess/es/log/cbean/ca/bs/BsClickLogCA.java | 27 +-
.../es/log/cbean/ca/bs/BsFavoriteLogCA.java | 6 +-
.../es/log/cbean/ca/bs/BsSearchLogCA.java | 42 +-
.../fess/es/log/cbean/cq/bs/BsClickLogCQ.java | 8 +-
.../es/log/cbean/cq/bs/BsFavoriteLogCQ.java | 5 +-
.../es/log/cbean/cq/bs/BsSearchLogCQ.java | 8 +-
.../fess/es/log/cbean/cq/bs/BsUserInfoCQ.java | 5 +-
.../fess/es/log/exentity/SearchLog.java | 5 +-
.../fess/es/user/bsbhv/BsGroupBhv.java | 9 +-
.../fess/es/user/bsbhv/BsRoleBhv.java | 9 +-
.../fess/es/user/bsbhv/BsUserBhv.java | 9 +-
.../fess/es/user/bsentity/dbmeta/UserDbm.java | 48 +-
.../fess/es/user/cbean/ca/bs/BsGroupCA.java | 3 +-
.../fess/es/user/cbean/ca/bs/BsRoleCA.java | 3 +-
.../fess/es/user/cbean/ca/bs/BsUserCA.java | 91 ++-
.../fess/es/user/cbean/cq/bs/BsGroupCQ.java | 5 +-
.../fess/es/user/cbean/cq/bs/BsRoleCQ.java | 5 +-
.../fess/es/user/cbean/cq/bs/BsUserCQ.java | 56 +-
.../java/org/codelibs/fess/exec/Crawler.java | 29 +-
.../codelibs/fess/exec/SuggestCreator.java | 5 +-
.../fess/exec/ThumbnailGenerator.java | 5 +-
.../org/codelibs/fess/filter/CorsFilter.java | 4 +-
.../codelibs/fess/filter/EncodingFilter.java | 4 +-
.../codelibs/fess/filter/WebApiFilter.java | 4 +-
.../fess/helper/CrawlerLogHelper.java | 3 +-
.../fess/helper/CrawlingInfoHelper.java | 43 +-
.../codelibs/fess/helper/DataIndexHelper.java | 4 +-
.../codelibs/fess/helper/FileTypeHelper.java | 4 +-
.../codelibs/fess/helper/IndexingHelper.java | 36 +-
.../org/codelibs/fess/helper/JobHelper.java | 43 +-
.../codelibs/fess/helper/KeyMatchHelper.java | 78 ++-
.../codelibs/fess/helper/LanguageHelper.java | 5 +-
.../fess/helper/NotificationHelper.java | 60 +-
.../codelibs/fess/helper/PluginHelper.java | 7 +-
.../fess/helper/PopularWordHelper.java | 54 +-
.../org/codelibs/fess/helper/QueryHelper.java | 100 ++--
.../codelibs/fess/helper/SearchHelper.java | 112 ++--
.../codelibs/fess/helper/SearchLogHelper.java | 48 +-
.../codelibs/fess/helper/SuggestHelper.java | 181 +++---
.../codelibs/fess/helper/SystemHelper.java | 92 ++-
.../codelibs/fess/helper/UserInfoHelper.java | 5 +-
.../org/codelibs/fess/helper/ViewHelper.java | 10 +-
.../fess/helper/VirtualHostHelper.java | 4 +-
.../codelibs/fess/indexer/IndexUpdater.java | 27 +-
.../java/org/codelibs/fess/job/CrawlJob.java | 20 +-
.../fess/job/GenerateThumbnailJob.java | 16 +-
.../org/codelibs/fess/job/SuggestJob.java | 16 +-
.../org/codelibs/fess/job/UpdateLabelJob.java | 51 +-
.../org/codelibs/fess/ldap/LdapManager.java | 529 ++++++++----------
.../java/org/codelibs/fess/ldap/LdapUser.java | 19 +-
.../fess/mylasta/action/FessHtmlPath.java | 20 +-
.../fess/mylasta/action/FessUserBean.java | 8 +-
.../fess/mylasta/direction/FessConfig.java | 55 +-
.../fess/mylasta/direction/FessProp.java | 447 +++++++--------
.../sponsor/FessActionAdjustmentProvider.java | 4 +-
.../fess/mylasta/mail/CrawlerPostcard.java | 6 +-
.../codelibs/fess/score/LtrQueryRescorer.java | 4 +-
.../org/codelibs/fess/score/ScoreBooster.java | 5 +-
.../fess/sso/aad/AzureAdAuthenticator.java | 87 ++-
.../fess/sso/saml/SamlAuthenticator.java | 243 ++++----
.../fess/sso/spnego/SpnegoAuthenticator.java | 98 ++--
.../codelibs/fess/taglib/FessFunctions.java | 8 +-
.../fess/thumbnail/ThumbnailManager.java | 28 +-
.../impl/BaseThumbnailGenerator.java | 81 ++-
.../thumbnail/impl/HtmlTagBasedGenerator.java | 94 ++--
.../org/codelibs/fess/util/DocumentUtil.java | 5 +-
.../org/codelibs/fess/util/FacetResponse.java | 24 +-
.../codelibs/fess/util/GsaConfigParser.java | 22 +-
.../codelibs/fess/util/QueryResponseList.java | 57 +-
.../fess/util/QueryStringBuilder.java | 67 ++-
.../org/codelibs/fess/util/UpgradeUtil.java | 25 +-
.../transformer/FessXpathTransformerTest.java | 3 +-
.../fess/helper/DocumentHelperTest.java | 6 +-
.../fess/helper/PluginHelperTest.java | 3 +-
.../codelibs/fess/helper/QueryHelperTest.java | 13 +-
.../org/codelibs/fess/it/CrawlTestBase.java | 5 +-
.../org/codelibs/fess/it/CrudTestBase.java | 4 +-
.../java/org/codelibs/fess/it/ITBase.java | 9 +-
.../codelibs/fess/it/admin/PluginTests.java | 20 +-
.../fess/it/search/SearchApiTests.java | 24 +-
.../fess/mylasta/FessActionDefTest.java | 2 +-
.../org/codelibs/fess/util/JvmUtilTest.java | 18 +-
264 files changed, 4353 insertions(+), 4911 deletions(-)
diff --git a/pom.xml b/pom.xml
index b172bfc9b..e37773adb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,7 @@
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.1</version>
<executions>
<execution>
<id>source-jar</id>
@@ -149,7 +149,7 @@
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>3.2.3</version>
+ <version>3.3.1</version>
<configuration>
<webResources>
<resource>
@@ -160,7 +160,7 @@
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.1.2</version>
<executions>
<execution>
<id>unpack-provided</id>
@@ -195,7 +195,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.2.0</version>
<configuration>
<encoding>UTF-8</encoding>
<docencoding>UTF-8</docencoding>
@@ -240,9 +240,9 @@
</executions>
</plugin>
<plugin>
- <groupId>net.revelc.code</groupId>
+ <groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
- <version>0.5.2</version>
+ <version>2.13.0</version>
<executions>
<execution>
<goals>
@@ -314,7 +314,7 @@
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
<executions>
<execution>
<id>copy-resources-deb</id>
@@ -413,7 +413,7 @@
<!-- zip, tarball -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.3.0</version>
<configuration>
<finalName>${project.artifactId}-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
diff --git a/src/main/java/org/codelibs/fess/Constants.java b/src/main/java/org/codelibs/fess/Constants.java
index 2e1e3ec9d..f7eca474d 100644
--- a/src/main/java/org/codelibs/fess/Constants.java
+++ b/src/main/java/org/codelibs/fess/Constants.java
@@ -250,8 +250,8 @@ public class Constants extends CoreLibConstants {
public static final String FTP = "FTP";
- public static final String[] RESERVED = { "+", "-", "&&", "||", "!", "(", ")", "{", "}", "[", "]", "^", "~", "*", "?", "\\", ";", ":",
- "/" };
+ public static final String[] RESERVED =
+ { "+", "-", "&&", "||", "!", "(", ")", "{", "}", "[", "]", "^", "~", "*", "?", "\\", ";", ":", "/" };
public static final Pattern LUCENE_FIELD_RESERVED_PATTERN = Pattern.compile("([+\\-!\\(\\){}\\[\\]^\"~\\\\:\\p{Zs}]|(&&)|(\\|\\|))"); // "*", "?",
@@ -341,8 +341,8 @@ public class Constants extends CoreLibConstants {
public static final String GUEST_USER = "guest";
- public static final String[] PAGER_CONVERSION_RULE = { "allRecordCount", "pageSize", "currentPageNumber", "allPageCount",
- "existPrePage", "existNextPage" };
+ public static final String[] PAGER_CONVERSION_RULE =
+ { "allRecordCount", "pageSize", "currentPageNumber", "allPageCount", "existPrePage", "existNextPage" };
// crawler types
public static final String WEB_CRAWLER_TYPE = "web_crawling";
diff --git a/src/main/java/org/codelibs/fess/api/es/EsApiManager.java b/src/main/java/org/codelibs/fess/api/es/EsApiManager.java
index 03852e920..dd0f8cd8e 100644
--- a/src/main/java/org/codelibs/fess/api/es/EsApiManager.java
+++ b/src/main/java/org/codelibs/fess/api/es/EsApiManager.java
@@ -75,8 +75,8 @@ public class EsApiManager extends BaseApiManager {
}
@Override
- public void process(final HttpServletRequest request, final HttpServletResponse response, final FilterChain chain) throws IOException,
- ServletException {
+ public void process(final HttpServletRequest request, final HttpServletResponse response, final FilterChain chain)
+ throws IOException, ServletException {
final RequestManager requestManager = ComponentUtil.getRequestManager();
if (!requestManager.findUserBean(FessUserBean.class).map(user -> user.hasRoles(acceptedRoles)).orElse(Boolean.FALSE)) {
response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized access: " + request.getServletPath());
diff --git a/src/main/java/org/codelibs/fess/api/gsa/GsaApiManager.java b/src/main/java/org/codelibs/fess/api/gsa/GsaApiManager.java
index 325adb7dc..2c8329aa9 100644
--- a/src/main/java/org/codelibs/fess/api/gsa/GsaApiManager.java
+++ b/src/main/java/org/codelibs/fess/api/gsa/GsaApiManager.java
@@ -88,8 +88,8 @@ public class GsaApiManager extends BaseApiManager implements WebApiManager {
}
@Override
- public void process(final HttpServletRequest request, final HttpServletResponse response, final FilterChain chain) throws IOException,
- ServletException {
+ public void process(final HttpServletRequest request, final HttpServletResponse response, final FilterChain chain)
+ throws IOException, ServletException {
switch (getFormatType(request)) {
case SEARCH:
processSearchRequest(request, response, chain);
@@ -281,7 +281,8 @@ public class GsaApiManager extends BaseApiManager implements WebApiManager {
buf.append("<HAS>");
buf.append("<L/>");
buf.append("<C SZ=\"");
- buf.append(DocumentUtil.getValue(document, fessConfig.getIndexFieldContentLength(), Long.class, (long) 0).longValue() / 1000);
+ buf.append(DocumentUtil.getValue(document, fessConfig.getIndexFieldContentLength(), Long.class, (long) 0).longValue()
+ / 1000);
document.remove(fessConfig.getIndexFieldContentLength());
buf.append("k\" CID=\"");
buf.append(DocumentUtil.getValue(document, fessConfig.getIndexFieldDocId(), String.class));
diff --git a/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java b/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
index b9c821fdd..81d1a4aa5 100644
--- a/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
+++ b/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
@@ -96,8 +96,8 @@ public class JsonApiManager extends BaseJsonApiManager {
}
@Override
- public void process(final HttpServletRequest request, final HttpServletResponse response, final FilterChain chain) throws IOException,
- ServletException {
+ public void process(final HttpServletRequest request, final HttpServletResponse response, final FilterChain chain)
+ throws IOException, ServletException {
switch (getFormatType(request)) {
case SEARCH:
processSearchRequest(request, response, chain);
@@ -126,7 +126,8 @@ public class JsonApiManager extends BaseJsonApiManager {
}
}
- protected void processScrollSearchRequest(final HttpServletRequest request, final HttpServletResponse response, final FilterChain chain) {
+ protected void processScrollSearchRequest(final HttpServletRequest request, final HttpServletResponse response,
+ final FilterChain chain) {
final SearchHelper searchHelper = ComponentUtil.getSearchHelper();
final FessConfig fessConfig = ComponentUtil.getFessConfig();
@@ -447,7 +448,8 @@ public class JsonApiManager extends BaseJsonApiManager {
}
- protected void processPopularWordRequest(final HttpServletRequest request, final HttpServletResponse response, final FilterChain chain) {
+ protected void processPopularWordRequest(final HttpServletRequest request, final HttpServletResponse response,
+ final FilterChain chain) {
if (!ComponentUtil.getFessConfig().isWebApiPopularWord()) {
writeJsonResponse(9, null, "Unsupported operation.");
return;
@@ -472,9 +474,8 @@ public class JsonApiManager extends BaseJsonApiManager {
Exception err = null;
final StringBuilder buf = new StringBuilder(255); // TODO replace response stream
try {
- final List<String> popularWordList =
- popularWordHelper.getWordList(SearchRequestType.JSON, seed, tagList.toArray(new String[tagList.size()]), null, fields,
- excludes);
+ final List<String> popularWordList = popularWordHelper.getWordList(SearchRequestType.JSON, seed,
+ tagList.toArray(new String[tagList.size()]), null, fields, excludes);
buf.append("\"result\":[");
boolean first1 = true;
@@ -524,58 +525,52 @@ public class JsonApiManager extends BaseJsonApiManager {
throw new WebApiException(6, "No searched urls.");
}
- searchHelper
- .getDocumentByDocId(docId, new String[] { fessConfig.getIndexFieldUrl(), fessConfig.getIndexFieldLang() },
- OptionalThing.empty())
- .ifPresent(
- doc -> {
- final String favoriteUrl = DocumentUtil.getValue(doc, fessConfig.getIndexFieldUrl(), String.class);
- final String userCode = userInfoHelper.getUserCode();
-
- if (StringUtil.isBlank(userCode)) {
- throw new WebApiException(2, "No user session.");
- } else if (StringUtil.isBlank(favoriteUrl)) {
- throw new WebApiException(2, "URL is null.");
- }
-
- boolean found = false;
- for (final String id : docIds) {
- if (docId.equals(id)) {
- found = true;
- break;
- }
- }
- if (!found) {
- throw new WebApiException(5, "Not found: " + favoriteUrl);
- }
-
- if (!favoriteLogService.addUrl(userCode, (userInfo, favoriteLog) -> {
- favoriteLog.setUserInfoId(userInfo.getId());
- favoriteLog.setUrl(favoriteUrl);
- favoriteLog.setDocId(docId);
- favoriteLog.setQueryId(queryId);
- favoriteLog.setCreatedAt(systemHelper.getCurrentTimeAsLocalDateTime());
- })) {
- throw new WebApiException(4, "Failed to add url: " + favoriteUrl);
- }
-
- final String id = DocumentUtil.getValue(doc, fessConfig.getIndexFieldId(), String.class);
- searchHelper.update(
- id,
- builder -> {
- final Script script =
- ComponentUtil.getLanguageHelper().createScript(doc,
- "ctx._source." + fessConfig.getIndexFieldFavoriteCount() + "+=1");
- builder.setScript(script);
- final Map<String, Object> upsertMap = new HashMap<>();
- upsertMap.put(fessConfig.getIndexFieldFavoriteCount(), 1);
- builder.setUpsert(upsertMap);
- builder.setRefreshPolicy(Constants.TRUE);
- });
-
- writeJsonResponse(0, "\"result\":\"ok\"", (String) null);
-
- }).orElse(() -> {
+ searchHelper.getDocumentByDocId(docId, new String[] { fessConfig.getIndexFieldUrl(), fessConfig.getIndexFieldLang() },
+ OptionalThing.empty()).ifPresent(doc -> {
+ final String favoriteUrl = DocumentUtil.getValue(doc, fessConfig.getIndexFieldUrl(), String.class);
+ final String userCode = userInfoHelper.getUserCode();
+
+ if (StringUtil.isBlank(userCode)) {
+ throw new WebApiException(2, "No user session.");
+ } else if (StringUtil.isBlank(favoriteUrl)) {
+ throw new WebApiException(2, "URL is null.");
+ }
+
+ boolean found = false;
+ for (final String id : docIds) {
+ if (docId.equals(id)) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ throw new WebApiException(5, "Not found: " + favoriteUrl);
+ }
+
+ if (!favoriteLogService.addUrl(userCode, (userInfo, favoriteLog) -> {
+ favoriteLog.setUserInfoId(userInfo.getId());
+ favoriteLog.setUrl(favoriteUrl);
+ favoriteLog.setDocId(docId);
+ favoriteLog.setQueryId(queryId);
+ favoriteLog.setCreatedAt(systemHelper.getCurrentTimeAsLocalDateTime());
+ })) {
+ throw new WebApiException(4, "Failed to add url: " + favoriteUrl);
+ }
+
+ final String id = DocumentUtil.getValue(doc, fessConfig.getIndexFieldId(), String.class);
+ searchHelper.update(id, builder -> {
+ final Script script = ComponentUtil.getLanguageHelper().createScript(doc,
+ "ctx._source." + fessConfig.getIndexFieldFavoriteCount() + "+=1");
+ builder.setScript(script);
+ final Map<String, Object> upsertMap = new HashMap<>();
+ upsertMap.put(fessConfig.getIndexFieldFavoriteCount(), 1);
+ builder.setUpsert(upsertMap);
+ builder.setRefreshPolicy(Constants.TRUE);
+ });
+
+ writeJsonResponse(0, "\"result\":\"ok\"", (String) null);
+
+ }).orElse(() -> {
throw new WebApiException(6, "Not found: " + docId);
});
@@ -620,11 +615,9 @@ public class JsonApiManager extends BaseJsonApiManager {
}
final String[] docIds = userInfoHelper.getResultDocIds(queryId);
- final List<Map<String, Object>> docList =
- searchHelper.getDocumentListByDocIds(
- docIds,
- new String[] { fessConfig.getIndexFieldUrl(), fessConfig.getIndexFieldDocId(),
- fessConfig.getIndexFieldFavoriteCount() }, OptionalThing.empty(), SearchRequestType.JSON);
+ final List<Map<String, Object>> docList = searchHelper.getDocumentListByDocIds(docIds, new String[] {
+ fessConfig.getIndexFieldUrl(), fessConfig.getIndexFieldDocId(), fessConfig.getIndexFieldFavoriteCount() },
+ OptionalThing.empty(), SearchRequestType.JSON);
List<String> urlList = new ArrayList<>(docList.size());
for (final Map<String, Object> doc : docList) {
final String urlObj = DocumentUtil.getValue(doc, fessConfig.getIndexFieldUrl(), String.class);
diff --git a/src/main/java/org/codelibs/fess/api/suggest/SuggestApiManager.java b/src/main/java/org/codelibs/fess/api/suggest/SuggestApiManager.java
index 354f65da1..805348a25 100644
--- a/src/main/java/org/codelibs/fess/api/suggest/SuggestApiManager.java
+++ b/src/main/java/org/codelibs/fess/api/suggest/SuggestApiManager.java
@@ -71,8 +71,8 @@ public class SuggestApiManager extends BaseJsonApiManager {
}
@Override
- public void process(final HttpServletRequest request, final HttpServletResponse response, final FilterChain chain) throws IOException,
- ServletException {
+ public void process(final HttpServletRequest request, final HttpServletResponse response, final FilterChain chain)
+ throws IOException, ServletException {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
if (!fessConfig.isAcceptedSearchReferer(request.getHeader("referer"))) {
writeJsonResponse(99, StringUtil.EMPTY, "Referer is invalid.");
diff --git a/src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java b/src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java
index 72b615fcf..93a46d414 100644
--- a/src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java
+++ b/src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java
@@ -98,8 +98,8 @@ public class AllJobScheduler implements LaJobScheduler {
@Override
public LaJobRunner createRunner() {
- return new LaJobRunner().useAccessContext(resource -> accessContextLogic.create(resource, OptionalThing::empty,
- OptionalThing::empty, () -> APP_TYPE));
+ return new LaJobRunner().useAccessContext(
+ resource -> accessContextLogic.create(resource, OptionalThing::empty, OptionalThing::empty, () -> APP_TYPE));
}
public void setJobClass(final Class<? extends LaJob> jobClass) {
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 4924f4603..cff1a5e6e 100644
--- a/src/main/java/org/codelibs/fess/app/service/AccessTokenService.java
+++ b/src/main/java/org/codelibs/fess/app/service/AccessTokenService.java
@@ -55,8 +55,8 @@ public class AccessTokenService {
// update pager
BeanUtil.copyBeanToBean(accessTokenList, accessTokenPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
- accessTokenPager.setPageNumberList(accessTokenList.pageRange(op -> op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()))
- .createPageNumberList());
+ accessTokenPager.setPageNumberList(
+ accessTokenList.pageRange(op -> op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger())).createPageNumberList());
return accessTokenList;
}
@@ -94,24 +94,21 @@ public class AccessTokenService {
public OptionalEntity<Set<String>> getPermissions(final HttpServletRequest request) {
final String token = ComponentUtil.getAccessTokenHelper().getAccessTokenFromRequest(request);
if (StringUtil.isNotBlank(token)) {
- return accessTokenBhv
- .selectEntity(cb -> {
- cb.query().setToken_Term(token);
- })
- .map(accessToken -> {
- final Set<String> permissionSet = new HashSet<>();
- final Long expiredTime = accessToken.getExpiredTime();
- if (expiredTime != null && expiredTime.longValue() > 0
- && expiredTime.longValue() < ComponentUtil.getSystemHelper().getCurrentTimeAsLong()) {
- throw new InvalidAccessTokenException("invalid_token", "The token is expired("
- + FessFunctions.formatDate(FessFunctions.date(expiredTime)) + ").");
- }
- stream(accessToken.getPermissions()).of(stream -> stream.forEach(permissionSet::add));
- final String name = accessToken.getParameterName();
- stream(request.getParameterValues(name)).of(
- stream -> stream.filter(StringUtil::isNotBlank).forEach(permissionSet::add));
- return OptionalEntity.of(permissionSet);
- }).orElseThrow(() -> new InvalidAccessTokenException("invalid_token", "Invalid token: " + token));
+ return accessTokenBhv.selectEntity(cb -> {
+ cb.query().setToken_Term(token);
+ }).map(accessToken -> {
+ final Set<String> permissionSet = new HashSet<>();
+ final Long expiredTime = accessToken.getExpiredTime();
+ if (expiredTime != null && expiredTime.longValue() > 0
+ && expiredTime.longValue() < ComponentUtil.getSystemHelper().getCurrentTimeAsLong()) {
+ throw new InvalidAccessTokenException("invalid_token",
+ "The token is expired(" + FessFunctions.formatDate(FessFunctions.date(expiredTime)) + ").");
+ }
+ stream(accessToken.getPermissions()).of(stream -> stream.forEach(permissionSet::add));
+ final String name = accessToken.getParameterName();
+ stream(request.getParameterValues(name)).of(stream -> stream.filter(StringUtil::isNotBlank).forEach(permissionSet::add));
+ return OptionalEntity.of(permissionSet);
+ }).orElseThrow(() -> new InvalidAccessTokenException("invalid_token", "Invalid token: " + token));
}
return OptionalEntity.empty();
}
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 06322e6a4..5cb52035e 100644
--- a/src/main/java/org/codelibs/fess/app/service/BadWordService.java
+++ b/src/main/java/org/codelibs/fess/app/service/BadWordService.java
@@ -67,8 +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(fessConfig.getPagingPageRangeSizeAsInteger()))
- .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 26ba908b0..9edb36a4f 100644
--- a/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java
+++ b/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java
@@ -47,8 +47,8 @@ public class BoostDocumentRuleService extends FessAppService {
// update pager
BeanUtil.copyBeanToBean(boostDocumentRuleList, boostDocumentRulePager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
- boostDocumentRulePager.setPageNumberList(boostDocumentRuleList.pageRange(
- op -> op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger())).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 e1d78104b..d579ddec7 100644
--- a/src/main/java/org/codelibs/fess/app/service/CharMappingService.java
+++ b/src/main/java/org/codelibs/fess/app/service/CharMappingService.java
@@ -38,19 +38,18 @@ public class CharMappingService {
protected FessConfig fessConfig;
public List<CharMappingItem> getCharMappingList(final String dictId, final CharMappingPager charMappingPager) {
- return getCharMappingFile(dictId).map(
- file -> {
- final int pageSize = charMappingPager.getPageSize();
- final PagingList<CharMappingItem> charMappingList =
- file.selectList((charMappingPager.getCurrentPageNumber() - 1) * pageSize, pageSize);
+ return getCharMappingFile(dictId).map(file -> {
+ final int pageSize = charMappingPager.getPageSize();
+ final PagingList<CharMappingItem> charMappingList =
+ file.selectList((charMappingPager.getCurrentPageNumber() - 1) * pageSize, pageSize);
- // update pager
- BeanUtil.copyBeanToBean(charMappingList, charMappingPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
- charMappingList.setPageRangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
- charMappingPager.setPageNumberList(charMappingList.createPageNumberList());
+ // update pager
+ BeanUtil.copyBeanToBean(charMappingList, charMappingPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
+ charMappingList.setPageRangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
+ charMappingPager.setPageNumberList(charMappingList.createPageNumberList());
- return (List<CharMappingItem>) charMappingList;
- }).orElse(Collections.emptyList());
+ return (List<CharMappingItem>) charMappingList;
+ }).orElse(Collections.emptyList());
}
public OptionalEntity<CharMappingFile> getCharMappingFile(final String dictId) {
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 0688be399..923a26843 100644
--- a/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java
+++ b/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java
@@ -76,8 +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(fessConfig.getPagingPageRangeSizeAsInteger()))
- .createPageNumberList());
+ crawlingInfoPager.setPageNumberList(
+ crawlingInfoList.pageRange(op -> op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger())).createPageNumberList());
return crawlingInfoList;
}
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 ac00237bf..9c5ff998d 100644
--- a/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java
+++ b/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java
@@ -202,13 +202,10 @@ public class ElevateWordService {
continue;
}
try {
- final String[] permissions =
- split(getValue(list, 2), ",").get(
- stream -> stream.map(permissionHelper::encode).filter(StringUtil::isNotBlank).distinct()
- .toArray(n -> new String[n]));
- final String[] labels =
- split(getValue(list, 3), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).distinct().toArray(n -> new String[n]));
+ final String[] permissions = split(getValue(list, 2), ",").get(stream -> stream.map(permissionHelper::encode)
+ .filter(StringUtil::isNotBlank).distinct().toArray(n -> new String[n]));
+ final String[] labels = split(getValue(list, 3), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).distinct().toArray(n -> new String[n]));
ElevateWord elevateWord = elevateWordBhv.selectEntity(cb -> {
cb.query().setSuggestWord_Equal(suggestWord);
if (permissions.length > 0) {
@@ -228,14 +225,13 @@ public class ElevateWordService {
elevateWord.setCreatedTime(now);
elevateWordBhv.insert(elevateWord);
final String id = elevateWord.getId();
- final List<ElevateWordToLabel> mappingList =
- stream(labels).get(
- stream -> stream.map(l -> labelTypeBhv.selectEntity(cb -> cb.query().setValue_Equal(l)).map(e -> {
- final ElevateWordToLabel m = new ElevateWordToLabel();
- m.setElevateWordId(id);
- m.setLabelTypeId(e.getId());
- return m;
- }).orElse(null)).filter(e -> e != null).collect(Collectors.toList()));
+ final List<ElevateWordToLabel> mappingList = stream(labels)
+ .get(stream -> stream.map(l -> labelTypeBhv.selectEntity(cb -> cb.query().setValue_Equal(l)).map(e -> {
+ final ElevateWordToLabel m = new ElevateWordToLabel();
+ m.setElevateWordId(id);
+ m.setLabelTypeId(e.getId());
+ return m;
+ }).orElse(null)).filter(e -> e != null).collect(Collectors.toList()));
if (!mappingList.isEmpty()) {
elevateWordToLabelBhv.batchInsert(mappingList);
}
@@ -251,21 +247,20 @@ public class ElevateWordService {
elevateWord.setUpdatedTime(now);
elevateWordBhv.update(elevateWord);
final String id = elevateWord.getId();
- final List<ElevateWordToLabel> mappingList =
- stream(labels).get(
- stream -> stream.map(l -> labelTypeBhv.selectEntity(cb -> cb.query().setValue_Equal(l)).map(e -> {
- final List<ElevateWordToLabel> mList = elevateWordToLabelBhv.selectList(cb -> {
- cb.query().setElevateWordId_Equal(id);
- cb.query().setLabelTypeId_Equal(e.getId());
- });
- if (!mList.isEmpty()) {
- return null;
- }
- final ElevateWordToLabel m = new ElevateWordToLabel();
- m.setElevateWordId(id);
- m.setLabelTypeId(e.getId());
- return m;
- }).orElse(null)).filter(e -> e != null).collect(Collectors.toList()));
+ final List<ElevateWordToLabel> mappingList = stream(labels)
+ .get(stream -> stream.map(l -> labelTypeBhv.selectEntity(cb -> cb.query().setValue_Equal(l)).map(e -> {
+ final List<ElevateWordToLabel> mList = elevateWordToLabelBhv.selectList(cb -> {
+ cb.query().setElevateWordId_Equal(id);
+ cb.query().setLabelTypeId_Equal(e.getId());
+ });
+ if (!mList.isEmpty()) {
+ return null;
+ }
+ final ElevateWordToLabel m = new ElevateWordToLabel();
+ m.setElevateWordId(id);
+ m.setLabelTypeId(e.getId());
+ return m;
+ }).orElse(null)).filter(e -> e != null).collect(Collectors.toList()));
if (!mappingList.isEmpty()) {
elevateWordToLabelBhv.batchInsert(mappingList);
}
@@ -300,17 +295,12 @@ public class ElevateWordService {
@Override
public void handle(final ElevateWord entity) {
final List<String> list = new ArrayList<>();
- final String permissions =
- stream(entity.getPermissions()).get(
- stream -> stream.map(s -> permissionHelper.decode(s)).filter(StringUtil::isNotBlank).distinct()
- .collect(Collectors.joining(",")));
- final String labels =
- elevateWordToLabelBhv
- .selectList(cb -> cb.query().setElevateWordId_Equal(entity.getId()))
- .stream()
- .map(e -> labelTypeBhv.selectByPK(e.getLabelTypeId()).map(LabelType::getValue)
- .filter(StringUtil::isNotBlank).orElse(null)).distinct().sorted()
- .collect(Collectors.joining(","));
+ final String permissions = stream(entity.getPermissions()).get(stream -> stream.map(s -> permissionHelper.decode(s))
+ .filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining(",")));
+ final String labels = elevateWordToLabelBhv
+ .selectList(cb -> cb.query().setElevateWordId_Equal(entity.getId())).stream().map(e -> labelTypeBhv
+ .selectByPK(e.getLabelTypeId()).map(LabelType::getValue).filter(StringUtil::isNotBlank).orElse(null))
+ .distinct().sorted().collect(Collectors.joining(","));
addToList(list, entity.getSuggestWord());
addToList(list, entity.getReading());
addToList(list, permissions);
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 5d36c20c7..7d28cab9b 100644
--- a/src/main/java/org/codelibs/fess/app/service/GroupService.java
+++ b/src/main/java/org/codelibs/fess/app/service/GroupService.java
@@ -83,13 +83,11 @@ public class GroupService {
op.setRefreshPolicy(Constants.TRUE);
});
- userBhv.selectCursor(
- cb -> cb.query().setGroups_Equal(group.getId()),
- entity -> {
- entity.setGroups(stream(entity.getGroups()).get(
- stream -> stream.filter(s -> !s.equals(group.getId())).toArray(n -> new String[n])));
- userBhv.insertOrUpdate(entity);
- });
+ userBhv.selectCursor(cb -> cb.query().setGroups_Equal(group.getId()), entity -> {
+ entity.setGroups(
+ stream(entity.getGroups()).get(stream -> stream.filter(s -> !s.equals(group.getId())).toArray(n -> new String[n])));
+ userBhv.insertOrUpdate(entity);
+ });
}
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 2a4589f97..eee1d58e2 100644
--- a/src/main/java/org/codelibs/fess/app/service/KuromojiService.java
+++ b/src/main/java/org/codelibs/fess/app/service/KuromojiService.java
@@ -43,12 +43,12 @@ public class KuromojiService {
final PagingList<KuromojiItem> kuromojiList = file.selectList((kuromojiPager.getCurrentPageNumber() - 1) * pageSize, pageSize);
// update pager
- BeanUtil.copyBeanToBean(kuromojiList, kuromojiPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
- kuromojiList.setPageRangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
- kuromojiPager.setPageNumberList(kuromojiList.createPageNumberList());
+ BeanUtil.copyBeanToBean(kuromojiList, kuromojiPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
+ kuromojiList.setPageRangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
+ kuromojiPager.setPageNumberList(kuromojiList.createPageNumberList());
- return (List<KuromojiItem>) kuromojiList;
- }).orElse(Collections.emptyList());
+ return (List<KuromojiItem>) kuromojiList;
+ }).orElse(Collections.emptyList());
}
public OptionalEntity<KuromojiFile> getKuromojiFile(final String dictId) {
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 33c83988d..f6a2795a5 100644
--- a/src/main/java/org/codelibs/fess/app/service/ProtwordsService.java
+++ b/src/main/java/org/codelibs/fess/app/service/ProtwordsService.java
@@ -38,19 +38,18 @@ public class ProtwordsService {
protected FessConfig fessConfig;
public List<ProtwordsItem> getProtwordsList(final String dictId, final ProtwordsPager protwordsPager) {
- return getProtwordsFile(dictId).map(
- file -> {
- final int pageSize = protwordsPager.getPageSize();
- final PagingList<ProtwordsItem> protwordsList =
- file.selectList((protwordsPager.getCurrentPageNumber() - 1) * pageSize, pageSize);
+ return getProtwordsFile(dictId).map(file -> {
+ final int pageSize = protwordsPager.getPageSize();
+ final PagingList<ProtwordsItem> protwordsList =
+ file.selectList((protwordsPager.getCurrentPageNumber() - 1) * pageSize, pageSize);
- // update pager
- BeanUtil.copyBeanToBean(protwordsList, protwordsPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
- protwordsList.setPageRangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
- protwordsPager.setPageNumberList(protwordsList.createPageNumberList());
+ // update pager
+ BeanUtil.copyBeanToBean(protwordsList, protwordsPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
+ protwordsList.setPageRangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
+ protwordsPager.setPageNumberList(protwordsList.createPageNumberList());
- return (List<ProtwordsItem>) protwordsList;
- }).orElse(Collections.emptyList());
+ return (List<ProtwordsItem>) protwordsList;
+ }).orElse(Collections.emptyList());
}
public OptionalEntity<ProtwordsFile> getProtwordsFile(final String dictId) {
diff --git a/src/main/java/org/codelibs/fess/app/service/RelatedContentService.java b/src/main/java/org/codelibs/fess/app/service/RelatedContentService.java
index 7c6f38d86..aa904efc7 100644
--- a/src/main/java/org/codelibs/fess/app/service/RelatedContentService.java
+++ b/src/main/java/org/codelibs/fess/app/service/RelatedContentService.java
@@ -48,8 +48,8 @@ public class RelatedContentService extends FessAppService {
// update pager
BeanUtil.copyBeanToBean(relatedContentList, relatedContentPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
- relatedContentPager.setPageNumberList(relatedContentList
- .pageRange(op -> op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger())).createPageNumberList());
+ relatedContentPager.setPageNumberList(
+ relatedContentList.pageRange(op -> op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger())).createPageNumberList());
return relatedContentList;
}
diff --git a/src/main/java/org/codelibs/fess/app/service/RelatedQueryService.java b/src/main/java/org/codelibs/fess/app/service/RelatedQueryService.java
index 14de679fb..eb73bf125 100644
--- a/src/main/java/org/codelibs/fess/app/service/RelatedQueryService.java
+++ b/src/main/java/org/codelibs/fess/app/service/RelatedQueryService.java
@@ -48,8 +48,8 @@ public class RelatedQueryService extends FessAppService {
// update pager
BeanUtil.copyBeanToBean(relatedQueryList, relatedQueryPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
- relatedQueryPager.setPageNumberList(relatedQueryList.pageRange(op -> op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()))
- .createPageNumberList());
+ relatedQueryPager.setPageNumberList(
+ relatedQueryList.pageRange(op -> op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger())).createPageNumberList());
return relatedQueryList;
}
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 bd72718cb..7f6205ddf 100644
--- a/src/main/java/org/codelibs/fess/app/service/RoleService.java
+++ b/src/main/java/org/codelibs/fess/app/service/RoleService.java
@@ -80,13 +80,11 @@ public class RoleService {
op.setRefreshPolicy(Constants.TRUE);
});
- userBhv.selectCursor(
- cb -> cb.query().setRoles_Equal(role.getId()),
- entity -> {
- entity.setRoles(stream(entity.getRoles()).get(
- stream -> stream.filter(s -> !s.equals(role.getId())).toArray(n -> new String[n])));
- userBhv.insertOrUpdate(entity);
- });
+ userBhv.selectCursor(cb -> cb.query().setRoles_Equal(role.getId()), entity -> {
+ entity.setRoles(
+ stream(entity.getRoles()).get(stream -> stream.filter(s -> !s.equals(role.getId())).toArray(n -> new String[n])));
+ userBhv.insertOrUpdate(entity);
+ });
}
protected void setupListCondition(final RoleCB cb, final RolePager rolePager) {
diff --git a/src/main/java/org/codelibs/fess/app/service/StemmerOverrideService.java b/src/main/java/org/codelibs/fess/app/service/StemmerOverrideService.java
index 367616691..65b52f68d 100644
--- a/src/main/java/org/codelibs/fess/app/service/StemmerOverrideService.java
+++ b/src/main/java/org/codelibs/fess/app/service/StemmerOverrideService.java
@@ -38,20 +38,18 @@ public class StemmerOverrideService {
protected FessConfig fessConfig;
public List<StemmerOverrideItem> getStemmerOverrideList(final String dictId, final StemmerOverridePager stemmerOvberridePager) {
- return getStemmerOverrideFile(dictId).map(
- file -> {
- final int pageSize = stemmerOvberridePager.getPageSize();
- final PagingList<StemmerOverrideItem> stemmerOvberrideList =
- file.selectList((stemmerOvberridePager.getCurrentPageNumber() - 1) * pageSize, pageSize);
+ return getStemmerOverrideFile(dictId).map(file -> {
+ final int pageSize = stemmerOvberridePager.getPageSize();
+ final PagingList<StemmerOverrideItem> stemmerOvberrideList =
+ file.selectList((stemmerOvberridePager.getCurrentPageNumber() - 1) * pageSize, pageSize);
- // update pager
- BeanUtil.copyBeanToBean(stemmerOvberrideList, stemmerOvberridePager,
- option -> option.include(Constants.PAGER_CONVERSION_RULE));
- stemmerOvberrideList.setPageRangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
- stemmerOvberridePager.setPageNumberList(stemmerOvberrideList.createPageNumberList());
+ // update pager
+ BeanUtil.copyBeanToBean(stemmerOvberrideList, stemmerOvberridePager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
+ stemmerOvberrideList.setPageRangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
+ stemmerOvberridePager.setPageNumberList(stemmerOvberrideList.createPageNumberList());
- return (List<StemmerOverrideItem>) stemmerOvberrideList;
- }).orElse(Collections.emptyList());
+ return (List<StemmerOverrideItem>) stemmerOvberrideList;
+ }).orElse(Collections.emptyList());
}
public OptionalEntity<StemmerOverrideFile> getStemmerOverrideFile(final String dictId) {
diff --git a/src/main/java/org/codelibs/fess/app/service/StopwordsService.java b/src/main/java/org/codelibs/fess/app/service/StopwordsService.java
index 0ed0bce75..ce4d0f82b 100644
--- a/src/main/java/org/codelibs/fess/app/service/StopwordsService.java
+++ b/src/main/java/org/codelibs/fess/app/service/StopwordsService.java
@@ -38,19 +38,18 @@ public class StopwordsService {
protected FessConfig fessConfig;
public List<StopwordsItem> getStopwordsList(final String dictId, final StopwordsPager stopwordsPager) {
- return getStopwordsFile(dictId).map(
- file -> {
- final int pageSize = stopwordsPager.getPageSize();
- final PagingList<StopwordsItem> stopwordsList =
- file.selectList((stopwordsPager.getCurrentPageNumber() - 1) * pageSize, pageSize);
+ return getStopwordsFile(dictId).map(file -> {
+ final int pageSize = stopwordsPager.getPageSize();
+ final PagingList<StopwordsItem> stopwordsList =
+ file.selectList((stopwordsPager.getCurrentPageNumber() - 1) * pageSize, pageSize);
- // update pager
- BeanUtil.copyBeanToBean(stopwordsList, stopwordsPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
- stopwordsList.setPageRangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
- stopwordsPager.setPageNumberList(stopwordsList.createPageNumberList());
+ // update pager
+ BeanUtil.copyBeanToBean(stopwordsList, stopwordsPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
+ stopwordsList.setPageRangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
+ stopwordsPager.setPageNumberList(stopwordsList.createPageNumberList());
- return (List<StopwordsItem>) stopwordsList;
- }).orElse(Collections.emptyList());
+ return (List<StopwordsItem>) stopwordsList;
+ }).orElse(Collections.emptyList());
}
public OptionalEntity<StopwordsFile> getStopwordsFile(final String dictId) {
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 d62ff72f6..49c6f31cb 100644
--- a/src/main/java/org/codelibs/fess/app/service/SynonymService.java
+++ b/src/main/java/org/codelibs/fess/app/service/SynonymService.java
@@ -43,12 +43,12 @@ public class SynonymService {
final PagingList<SynonymItem> synonymList = file.selectList((synonymPager.getCurrentPageNumber() - 1) * pageSize, pageSize);
// update pager
- BeanUtil.copyBeanToBean(synonymList, synonymPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
- synonymList.setPageRangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
- synonymPager.setPageNumberList(synonymList.createPageNumberList());
+ BeanUtil.copyBeanToBean(synonymList, synonymPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
+ synonymList.setPageRangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
+ synonymPager.setPageNumberList(synonymList.createPageNumberList());
- return (List<SynonymItem>) synonymList;
- }).orElse(Collections.emptyList());
+ return (List<SynonymItem>) synonymList;
+ }).orElse(Collections.emptyList());
}
public OptionalEntity<SynonymFile> getSynonymFile(final String dictId) {
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/AdminAction.java b/src/main/java/org/codelibs/fess/app/web/admin/AdminAction.java
index d55e4b001..7a69e0b73 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/AdminAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/AdminAction.java
@@ -70,7 +70,7 @@ public class AdminAction extends FessAdminAction {
// ==============
@Execute
@Secured({ //
- AdminDashboardAction.ROLE, //
+ AdminDashboardAction.ROLE, //
AdminDashboardAction.ROLE + VIEW, //
AdminWizardAction.ROLE, //
AdminWizardAction.ROLE + VIEW, //
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/AdminAccesstokenAction.java b/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/AdminAccesstokenAction.java
index 810362256..da53a6747 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/AdminAccesstokenAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/AdminAccesstokenAction.java
@@ -150,29 +150,20 @@ public class AdminAccesstokenAction extends FessAdminAction {
public HtmlResponse details(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.DETAILS);
saveToken();
- return asDetailsHtml().useForm(
- EditForm.class,
- op -> {
- op.setup(form -> {
- accessTokenService
- .getAccessToken(id)
- .ifPresent(
- entity -> {
- copyBeanToBean(entity, form, copyOp -> copyOp.exclude(Constants.PERMISSIONS, EXPIRED_TIME)
- .excludeNull().dateConverter(Constants.DEFAULT_DATETIME_FORMAT, EXPIRES));
- final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- form.permissions =
- stream(entity.getPermissions()).get(
- stream -> stream.map(permissionHelper::decode).filter(StringUtil::isNotBlank)
- .distinct().collect(Collectors.joining("\n")));
- form.crudMode = crudMode;
- })
- .orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id),
- this::asListHtml);
- });
- });
+ return asDetailsHtml().useForm(EditForm.class, op -> {
+ op.setup(form -> {
+ accessTokenService.getAccessToken(id).ifPresent(entity -> {
+ copyBeanToBean(entity, form, copyOp -> copyOp.exclude(Constants.PERMISSIONS, EXPIRED_TIME).excludeNull()
+ .dateConverter(Constants.DEFAULT_DATETIME_FORMAT, EXPIRES));
+ final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
+ form.permissions = stream(entity.getPermissions()).get(stream -> stream.map(permissionHelper::decode)
+ .filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
+ form.crudMode = crudMode;
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asListHtml);
});
+ });
+ });
}
@Execute
@@ -180,23 +171,15 @@ public class AdminAccesstokenAction extends FessAdminAction {
public HtmlResponse edit(final EditForm form) {
validate(form, messages -> {}, this::asListHtml);
final String id = form.id;
- accessTokenService
- .getAccessToken(id)
- .ifPresent(
- entity -> {
- copyBeanToBean(
- entity,
- form,
- op -> op.exclude(Constants.PERMISSIONS, EXPIRED_TIME).dateConverter(Constants.DEFAULT_DATETIME_FORMAT,
- EXPIRES));
- final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- form.permissions =
- stream(entity.getPermissions()).get(
- stream -> stream.map(permissionHelper::decode).filter(StringUtil::isNotBlank).distinct()
- .collect(Collectors.joining("\n")));
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asListHtml);
- });
+ accessTokenService.getAccessToken(id).ifPresent(entity -> {
+ copyBeanToBean(entity, form,
+ op -> op.exclude(Constants.PERMISSIONS, EXPIRED_TIME).dateConverter(Constants.DEFAULT_DATETIME_FORMAT, EXPIRES));
+ final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
+ form.permissions = stream(entity.getPermissions()).get(stream -> stream.map(permissionHelper::decode)
+ .filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asListHtml);
+ });
saveToken();
if (form.crudMode.intValue() == CrudMode.EDIT) {
// back
@@ -217,17 +200,16 @@ public class AdminAccesstokenAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getAccessToken(form).ifPresent(
- entity -> {
- entity.setToken(accessTokenHelper.generateAccessToken());
- try {
- accessTokenService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getAccessToken(form).ifPresent(entity -> {
+ entity.setToken(accessTokenHelper.generateAccessToken());
+ try {
+ accessTokenService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirect(getClass());
@@ -239,16 +221,15 @@ public class AdminAccesstokenAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getAccessToken(form).ifPresent(
- entity -> {
- try {
- accessTokenService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getAccessToken(form).ifPresent(entity -> {
+ try {
+ accessTokenService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), this::asEditHtml);
});
return redirect(getClass());
@@ -261,21 +242,17 @@ public class AdminAccesstokenAction extends FessAdminAction {
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
final String id = form.id;
- accessTokenService
- .getAccessToken(id)
- .ifPresent(
- entity -> {
- try {
- accessTokenService.delete(entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
- });
+ accessTokenService.getAccessToken(id).ifPresent(entity -> {
+ try {
+ accessTokenService.delete(entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
+ });
return redirect(getClass());
}
@@ -306,19 +283,16 @@ public class AdminAccesstokenAction extends FessAdminAction {
final SystemHelper systemHelper = ComponentUtil.getSystemHelper();
final String username = systemHelper.getUsername();
final long currentTime = systemHelper.getCurrentTimeAsLong();
- return getEntity(form, username, currentTime).map(
- entity -> {
- entity.setUpdatedBy(username);
- entity.setUpdatedTime(currentTime);
- BeanUtil.copyBeanToBean(form, entity,
- op -> op.exclude(Constants.COMMON_CONVERSION_RULE).exclude(TOKEN, Constants.PERMISSIONS, EXPIRED_TIME)
- .dateConverter(Constants.DEFAULT_DATETIME_FORMAT, EXPIRES));
- final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- entity.setPermissions(split(form.permissions, "\n").get(
- stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).distinct()
- .toArray(n -> new String[n])));
- return entity;
- });
+ return getEntity(form, username, currentTime).map(entity -> {
+ entity.setUpdatedBy(username);
+ entity.setUpdatedTime(currentTime);
+ BeanUtil.copyBeanToBean(form, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)
+ .exclude(TOKEN, Constants.PERMISSIONS, EXPIRED_TIME).dateConverter(Constants.DEFAULT_DATETIME_FORMAT, EXPIRES));
+ final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
+ entity.setPermissions(split(form.permissions, "\n").get(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/backup/AdminBackupAction.java b/src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java
index 0cdf2f21d..e62f1d3e5 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
@@ -184,45 +184,38 @@ public class AdminBackupAction extends FessAdminAction {
private void importBulk(final String fileName, final File tempFile) {
final ObjectMapper mapper = new ObjectMapper();
- try (CurlResponse response =
- ComponentUtil
- .getCurlHelper()
- .post("/_bulk")
- .onConnect(
- (req, con) -> {
- con.setDoOutput(true);
- try (final BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(tempFile)));
- final BufferedWriter bw =
- new BufferedWriter(new OutputStreamWriter(con.getOutputStream(),
- Constants.CHARSET_UTF_8))) {
- String line;
- while ((line = br.readLine()) != null) {
- if (StringUtil.isNotBlank(line)) {
- final Map<String, Map<String, String>> dataObj;
- if (line.contains("_type")) {
- dataObj = parseObject(mapper, line);
- } else {
- dataObj = null;
- }
- if (dataObj != null) {
- final Map<String, String> indexObj = dataObj.get("index");
- if (indexObj != null && indexObj.containsKey("_type")) {
- indexObj.remove("_type");
- bw.write(mapper.writeValueAsString(dataObj));
- } else {
- bw.write(line);
- }
- } else {
- bw.write(line);
- }
- }
- bw.write("\n");
- }
- bw.flush();
- } catch (IOException e) {
- throw new IORuntimeException(e);
- }
- }).execute()) {
+ try (CurlResponse response = ComponentUtil.getCurlHelper().post("/_bulk").onConnect((req, con) -> {
+ con.setDoOutput(true);
+ try (final BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(tempFile)));
+ final BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(con.getOutputStream(), Constants.CHARSET_UTF_8))) {
+ String line;
+ while ((line = br.readLine()) != null) {
+ if (StringUtil.isNotBlank(line)) {
+ final Map<String, Map<String, String>> dataObj;
+ if (line.contains("_type")) {
+ dataObj = parseObject(mapper, line);
+ } else {
+ dataObj = null;
+ }
+ if (dataObj != null) {
+ final Map<String, String> indexObj = dataObj.get("index");
+ if (indexObj != null && indexObj.containsKey("_type")) {
+ indexObj.remove("_type");
+ bw.write(mapper.writeValueAsString(dataObj));
+ } else {
+ bw.write(line);
+ }
+ } else {
+ bw.write(line);
+ }
+ }
+ bw.write("\n");
+ }
+ bw.flush();
+ } catch (IOException e) {
+ throw new IORuntimeException(e);
+ }
+ }).execute()) {
if (logger.isDebugEnabled()) {
logger.debug("Bulk Response:\n{}", response.getContentAsString());
}
@@ -338,14 +331,12 @@ public class AdminBackupAction extends FessAdminAction {
index = id;
filename = id + ".bulk";
}
- return asStream(filename).contentTypeOctetStream().stream(
- out -> {
- try (CurlResponse response =
- ComponentUtil.getCurlHelper().get("/" + index + "/_data").param("format", "json")
- .param("scroll", fessConfig.getIndexScrollSearchTimeout()).execute()) {
- out.write(response.getContentAsStream());
- }
- });
+ return asStream(filename).contentTypeOctetStream().stream(out -> {
+ try (CurlResponse response = ComponentUtil.getCurlHelper().get("/" + index + "/_data").param("format", "json")
+ .param("scroll", fessConfig.getIndexScrollSearchTimeout()).execute()) {
+ out.write(response.getContentAsStream());
+ }
+ });
}
}
throwValidationError(messages -> messages.addErrorsCouldNotFindBackupIndex(GLOBAL), this::asListHtml);
@@ -385,14 +376,12 @@ public class AdminBackupAction extends FessAdminAction {
((LocalDateTime) value).atZone(ZoneId.systemDefault()).withZoneSameInstant(ZoneId.of("UTC")).format(ISO_8601_FORMATTER);
buf.append('"').append(StringEscapeUtils.escapeJson(format)).append('"');
} else if (value instanceof String[]) {
- final String json =
- Arrays.stream((String[]) value).map(s -> "\"" + StringEscapeUtils.escapeJson(s) + "\"")
- .collect(Collectors.joining(","));
+ final String json = Arrays.stream((String[]) value).map(s -> "\"" + StringEscapeUtils.escapeJson(s) + "\"")
+ .collect(Collectors.joining(","));
buf.append('[').append(json).append(']');
} else if (value instanceof List) {
- final String json =
- ((List<?>) value).stream().map(s -> "\"" + StringEscapeUtils.escapeJson(s.toString()) + "\"")
- .collect(Collectors.joining(","));
+ final String json = ((List<?>) value).stream().map(s -> "\"" + StringEscapeUtils.escapeJson(s.toString()) + "\"")
+ .collect(Collectors.joining(","));
buf.append('[').append(json).append(']');
} else if (value instanceof Map) {
buf.append('{');
@@ -416,47 +405,41 @@ public class AdminBackupAction extends FessAdminAction {
public static Consumer<Writer> getSearchLogNdjsonWriteCall() {
return writer -> {
final SearchLogBhv bhv = ComponentUtil.getComponent(SearchLogBhv.class);
- bhv.selectCursor(
- cb -> {
- cb.query().matchAll();
- cb.query().addOrderBy_RequestedAt_Asc();
- },
- entity -> {
- final StringBuilder buf = new StringBuilder();
- buf.append('{');
- appendJson("id", entity.getId(), buf).append(',');
- appendJson("query-id", entity.getQueryId(), buf).append(',');
- appendJson("user-info-id", entity.getUserInfoId(), buf).append(',');
- appendJson("user-session-id", entity.getUserSessionId(), buf).append(',');
- appendJson("user", entity.getUser(), buf).append(',');
- appendJson("search-word", entity.getSearchWord(), buf).append(',');
- appendJson("hit-count", entity.getHitCount(), buf).append(',');
- appendJson("query-page-size", entity.getQueryPageSize(), buf).append(',');
- appendJson("query-offset", entity.getQueryOffset(), buf).append(',');
- appendJson("referer", entity.getReferer(), buf).append(',');
- appendJson("languages", entity.getLanguages(), buf).append(',');
- appendJson("roles", entity.getRoles(), buf).append(',');
- appendJson("user-agent", entity.getUserAgent(), buf).append(',');
- appendJson("client-ip", entity.getClientIp(), buf).append(',');
- appendJson("access-type", entity.getAccessType(), buf).append(',');
- appendJson("query-time", entity.getQueryTime(), buf).append(',');
- appendJson("response-time", entity.getResponseTime(), buf).append(',');
- appendJson("requested-at", entity.getRequestedAt(), buf).append(',');
- final Map<String, List<String>> searchFieldMap =
- entity.getSearchFieldLogList()
- .stream()
- .collect(
- Collectors.groupingBy(Pair::getFirst,
- Collectors.mapping(Pair::getSecond, Collectors.toList())));
- appendJson("search-field", searchFieldMap, buf);
- buf.append('}');
- buf.append('\n');
- try {
- writer.write(buf.toString());
- } catch (final IOException e) {
- throw new IORuntimeException(e);
- }
- });
+ bhv.selectCursor(cb -> {
+ cb.query().matchAll();
+ cb.query().addOrderBy_RequestedAt_Asc();
+ }, entity -> {
+ final StringBuilder buf = new StringBuilder();
+ buf.append('{');
+ appendJson("id", entity.getId(), buf).append(',');
+ appendJson("query-id", entity.getQueryId(), buf).append(',');
+ appendJson("user-info-id", entity.getUserInfoId(), buf).append(',');
+ appendJson("user-session-id", entity.getUserSessionId(), buf).append(',');
+ appendJson("user", entity.getUser(), buf).append(',');
+ appendJson("search-word", entity.getSearchWord(), buf).append(',');
+ appendJson("hit-count", entity.getHitCount(), buf).append(',');
+ appendJson("query-page-size", entity.getQueryPageSize(), buf).append(',');
+ appendJson("query-offset", entity.getQueryOffset(), buf).append(',');
+ appendJson("referer", entity.getReferer(), buf).append(',');
+ appendJson("languages", entity.getLanguages(), buf).append(',');
+ appendJson("roles", entity.getRoles(), buf).append(',');
+ appendJson("user-agent", entity.getUserAgent(), buf).append(',');
+ appendJson("client-ip", entity.getClientIp(), buf).append(',');
+ appendJson("access-type", entity.getAccessType(), buf).append(',');
+ appendJson("query-time", entity.getQueryTime(), buf).append(',');
+ appendJson("response-time", entity.getResponseTime(), buf).append(',');
+ appendJson("requested-at", entity.getRequestedAt(), buf).append(',');
+ final Map<String, List<String>> searchFieldMap = entity.getSearchFieldLogList().stream()
+ .collect(Collectors.groupingBy(Pair::getFirst, Collectors.mapping(Pair::getSecond, Collectors.toList())));
+ appendJson("search-field", searchFieldMap, buf);
+ buf.append('}');
+ buf.append('\n');
+ try {
+ writer.write(buf.toString());
+ } catch (final IOException e) {
+ throw new IORuntimeException(e);
+ }
+ });
};
}
@@ -548,8 +531,8 @@ public class AdminBackupAction extends FessAdminAction {
}
private HtmlResponse asListHtml() {
- return asHtml(path_AdminBackup_AdminBackupJsp).useForm(UploadForm.class).renderWith(
- data -> RenderDataUtil.register(data, "backupItems", getBackupItems()));
+ return asHtml(path_AdminBackup_AdminBackupJsp).useForm(UploadForm.class)
+ .renderWith(data -> RenderDataUtil.register(data, "backupItems", getBackupItems()));
}
private void deleteTempFile(final File tempFile) {
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java b/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java
index dca0056d3..b35be038e 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java
@@ -239,17 +239,16 @@ public class AdminBadwordAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getBadWord(form).ifPresent(
- entity -> {
- try {
- badWordService.store(entity);
- suggestHelper.addBadWord(entity.getSuggestWord(), false);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getBadWord(form).ifPresent(entity -> {
+ try {
+ badWordService.store(entity);
+ suggestHelper.addBadWord(entity.getSuggestWord(), false);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirect(getClass());
@@ -261,17 +260,16 @@ public class AdminBadwordAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getBadWord(form).ifPresent(
- entity -> {
- try {
- badWordService.store(entity);
- suggestHelper.storeAllBadWords(false);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getBadWord(form).ifPresent(entity -> {
+ try {
+ badWordService.store(entity);
+ suggestHelper.storeAllBadWords(false);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), this::asEditHtml);
});
return redirect(getClass());
@@ -284,22 +282,18 @@ public class AdminBadwordAction extends FessAdminAction {
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
final String id = form.id;
- badWordService
- .getBadWord(id)
- .ifPresent(
- entity -> {
- try {
- badWordService.delete(entity);
- suggestHelper.deleteBadWord(entity.getSuggestWord());
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asDetailsHtml);
- }
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
- });
+ badWordService.getBadWord(id).ifPresent(entity -> {
+ try {
+ badWordService.delete(entity);
+ suggestHelper.deleteBadWord(entity.getSuggestWord());
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asDetailsHtml);
+ }
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
+ });
return redirect(getClass());
}
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java
index ea2755c8d..39f0d686d 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java
@@ -181,16 +181,15 @@ public class AdminBoostdocAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getBoostDocumentRule(form).ifPresent(
- entity -> {
- try {
- boostDocumentRuleService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getBoostDocumentRule(form).ifPresent(entity -> {
+ try {
+ boostDocumentRuleService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirect(getClass());
@@ -202,16 +201,15 @@ public class AdminBoostdocAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getBoostDocumentRule(form).ifPresent(
- entity -> {
- try {
- boostDocumentRuleService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getBoostDocumentRule(form).ifPresent(entity -> {
+ try {
+ boostDocumentRuleService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), this::asEditHtml);
});
return redirect(getClass());
@@ -224,21 +222,17 @@ public class AdminBoostdocAction extends FessAdminAction {
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
final String id = form.id;
- boostDocumentRuleService
- .getBoostDocumentRule(id)
- .ifPresent(
- entity -> {
- try {
- boostDocumentRuleService.delete(entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
- });
+ boostDocumentRuleService.getBoostDocumentRule(id).ifPresent(entity -> {
+ try {
+ boostDocumentRuleService.delete(entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
+ });
return redirect(getClass());
}
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java b/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java
index 7208cf504..2979a727c 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java
@@ -221,7 +221,7 @@ public class AdminCrawlinginfoAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminCrawlinginfo_AdminCrawlinginfoJsp).renderWith(data -> {
RenderDataUtil.register(data, "crawlingInfoItems", crawlingInfoService.getCrawlingInfoList(crawlingInfoPager)); // page navi
- }).useForm(SearchForm.class, setup -> {
+ }).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(crawlingInfoPager, form, op -> op.include("id"));
});
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 918393a27..df1dbadff 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
@@ -153,26 +153,19 @@ public class AdminDataconfigAction extends FessAdminAction {
public HtmlResponse edit(final EditForm form) {
validate(form, messages -> {}, this::asListHtml);
final String id = form.id;
- dataConfigService
- .getDataConfig(id)
- .ifPresent(
- entity -> {
- copyBeanToBean(entity, form, copyOp -> {
- copyOp.excludeNull();
- copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
- });
- final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- form.permissions =
- stream(entity.getPermissions()).get(
- stream -> stream.map(permissionHelper::decode).filter(StringUtil::isNotBlank).distinct()
- .collect(Collectors.joining("\n")));
- form.virtualHosts =
- stream(entity.getVirtualHosts()).get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim)
- .collect(Collectors.joining("\n")));
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asListHtml);
- });
+ dataConfigService.getDataConfig(id).ifPresent(entity -> {
+ copyBeanToBean(entity, form, copyOp -> {
+ copyOp.excludeNull();
+ copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
+ });
+ final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
+ form.permissions = stream(entity.getPermissions()).get(stream -> stream.map(permissionHelper::decode)
+ .filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
+ form.virtualHosts = stream(entity.getVirtualHosts())
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).collect(Collectors.joining("\n")));
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asListHtml);
+ });
saveToken();
if (form.crudMode.intValue() == CrudMode.EDIT) {
// back
@@ -192,34 +185,23 @@ public class AdminDataconfigAction extends FessAdminAction {
public HtmlResponse details(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.DETAILS);
saveToken();
- return asDetailsHtml().useForm(
- EditForm.class,
- op -> {
- op.setup(form -> {
- dataConfigService
- .getDataConfig(id)
- .ifPresent(
- entity -> {
- copyBeanToBean(entity, form, copyOp -> {
- copyOp.excludeNull();
- copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
- });
- final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- form.permissions =
- stream(entity.getPermissions()).get(
- stream -> stream.map(s -> permissionHelper.decode(s))
- .filter(StringUtil::isNotBlank).distinct()
- .collect(Collectors.joining("\n")));
- form.virtualHosts =
- stream(entity.getVirtualHosts()).get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim)
- .collect(Collectors.joining("\n")));
- form.crudMode = crudMode;
- })
- .orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id),
- this::asListHtml));
+ return asDetailsHtml().useForm(EditForm.class, op -> {
+ op.setup(form -> {
+ dataConfigService.getDataConfig(id).ifPresent(entity -> {
+ copyBeanToBean(entity, form, copyOp -> {
+ copyOp.excludeNull();
+ copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
});
- });
+ final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
+ form.permissions = stream(entity.getPermissions()).get(stream -> stream.map(s -> permissionHelper.decode(s))
+ .filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
+ form.virtualHosts = stream(entity.getVirtualHosts())
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).collect(Collectors.joining("\n")));
+ form.crudMode = crudMode;
+ }).orElse(
+ () -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asListHtml));
+ });
+ });
}
// -----------------------------------------------------
@@ -231,16 +213,15 @@ public class AdminDataconfigAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getDataConfig(form).ifPresent(
- entity -> {
- try {
- dataConfigService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getDataConfig(form).ifPresent(entity -> {
+ try {
+ dataConfigService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirect(getClass());
@@ -252,16 +233,15 @@ public class AdminDataconfigAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getDataConfig(form).ifPresent(
- entity -> {
- try {
- dataConfigService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getDataConfig(form).ifPresent(entity -> {
+ try {
+ dataConfigService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), this::asEditHtml);
});
return redirect(getClass());
@@ -274,20 +254,15 @@ public class AdminDataconfigAction extends FessAdminAction {
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
final String id = form.id;
- dataConfigService
- .getDataConfig(id)
- .ifPresent(
- entity -> {
- try {
- dataConfigService.delete(entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- })
- .orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml));
+ dataConfigService.getDataConfig(id).ifPresent(entity -> {
+ try {
+ dataConfigService.delete(entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml));
return redirect(getClass());
}
@@ -317,23 +292,20 @@ public class AdminDataconfigAction extends FessAdminAction {
final SystemHelper systemHelper = ComponentUtil.getSystemHelper();
final String username = systemHelper.getUsername();
final long currentTime = systemHelper.getCurrentTimeAsLong();
- return getEntity(form, username, currentTime).map(
- entity -> {
- entity.setUpdatedBy(username);
- entity.setUpdatedTime(currentTime);
- copyBeanToBean(
- form,
- entity,
- op -> op.exclude(Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE),
- Stream.of(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS)).toArray(n -> new String[n])));
- final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- entity.setPermissions(split(form.permissions, "\n").get(
- stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).distinct()
- .toArray(n -> new String[n])));
- entity.setVirtualHosts(split(form.virtualHosts, "\n").get(
- stream -> stream.filter(StringUtil::isNotBlank).distinct().map(String::trim).toArray(n -> new String[n])));
- return entity;
- });
+ return getEntity(form, username, currentTime).map(entity -> {
+ entity.setUpdatedBy(username);
+ entity.setUpdatedTime(currentTime);
+ copyBeanToBean(form, entity,
+ op -> op.exclude(Stream
+ .concat(Stream.of(Constants.COMMON_CONVERSION_RULE), Stream.of(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS))
+ .toArray(n -> new String[n])));
+ final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
+ entity.setPermissions(split(form.permissions, "\n").get(stream -> stream.map(s -> permissionHelper.encode(s))
+ .filter(StringUtil::isNotBlank).distinct().toArray(n -> new String[n])));
+ entity.setVirtualHosts(split(form.virtualHosts, "\n")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).distinct().map(String::trim).toArray(n -> new String[n])));
+ return entity;
+ });
}
protected void registerRolesAndLabels(final RenderData data) {
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java
index 89b2ed5e1..9f0be30c8 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java
@@ -154,15 +154,12 @@ public class AdminDictKuromojiAction extends FessAdminAction {
@Secured({ ROLE })
public HtmlResponse edit(final EditForm form) {
validate(form, messages -> {}, () -> asListHtml(form.dictId));
- kuromojiService
- .getKuromojiItem(form.dictId, form.id)
- .ifPresent(entity -> {
- copyBeanToBean(entity, form, op -> {});
- })
- .orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
- () -> asListHtml(form.dictId));
- });
+ kuromojiService.getKuromojiItem(form.dictId, form.id).ifPresent(entity -> {
+ copyBeanToBean(entity, form, op -> {});
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
+ () -> asListHtml(form.dictId));
+ });
saveToken();
if (form.crudMode.intValue() == CrudMode.EDIT) {
// back
@@ -182,26 +179,20 @@ public class AdminDictKuromojiAction extends FessAdminAction {
public HtmlResponse details(final String dictId, final int crudMode, final long id) {
verifyCrudMode(crudMode, CrudMode.DETAILS, dictId);
saveToken();
- return asDetailsHtml().useForm(
- EditForm.class,
- op -> {
- op.setup(form -> {
- kuromojiService
- .getKuromojiItem(dictId, id)
- .ifPresent(entity -> {
- copyBeanToBean(entity, form, copyOp -> {
- copyOp.excludeNull();
- });
- form.crudMode = crudMode;
- })
- .orElse(() -> {
- throwValidationError(
- messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, dictId + ":" + id),
- () -> asListHtml(dictId));
- });
- form.dictId = dictId;
+ return asDetailsHtml().useForm(EditForm.class, op -> {
+ op.setup(form -> {
+ kuromojiService.getKuromojiItem(dictId, id).ifPresent(entity -> {
+ copyBeanToBean(entity, form, copyOp -> {
+ copyOp.excludeNull();
});
+ form.crudMode = crudMode;
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, dictId + ":" + id),
+ () -> asListHtml(dictId));
});
+ form.dictId = dictId;
+ });
+ });
}
// -----------------------------------------------------
@@ -229,17 +220,14 @@ public class AdminDictKuromojiAction extends FessAdminAction {
public ActionResponse download(final DownloadForm form) {
validate(form, messages -> {}, () -> downloadpage(form.dictId));
verifyTokenKeep(() -> downloadpage(form.dictId));
- return kuromojiService
- .getKuromojiFile(form.dictId)
+ return kuromojiService.getKuromojiFile(form.dictId)
.map(file -> asStream(new File(file.getPath()).getName()).contentTypeOctetStream().stream(out -> {
file.writeOut(out);
- }))
- .orElseGet(
- () -> {
- throwValidationError(messages -> messages.addErrorsFailedToDownloadKuromojiFile(GLOBAL),
- () -> downloadpage(form.dictId));
- return null;
- });
+ })).orElseGet(() -> {
+ throwValidationError(messages -> messages.addErrorsFailedToDownloadKuromojiFile(GLOBAL),
+ () -> downloadpage(form.dictId));
+ return null;
+ });
}
// -----------------------------------------------------
@@ -267,21 +255,19 @@ public class AdminDictKuromojiAction extends FessAdminAction {
public HtmlResponse upload(final UploadForm form) {
validate(form, messages -> {}, () -> uploadpage(form.dictId));
verifyToken(() -> uploadpage(form.dictId));
- return kuromojiService
- .getKuromojiFile(form.dictId)
- .map(file -> {
- try (InputStream inputStream = form.kuromojiFile.getInputStream()) {
- file.update(inputStream);
- } catch (final IOException e) {
- throwValidationError(messages -> messages.addErrorsFailedToUploadKuromojiFile(GLOBAL),
- () -> redirectWith(getClass(), moreUrl("uploadpage/" + form.dictId)));
- }
- saveInfo(messages -> messages.addSuccessUploadKuromojiFile(GLOBAL));
- return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
- }).orElseGet(() -> {
- throwValidationError(messages -> messages.addErrorsFailedToUploadKuromojiFile(GLOBAL), () -> uploadpage(form.dictId));
- return null;
- });
+ return kuromojiService.getKuromojiFile(form.dictId).map(file -> {
+ try (InputStream inputStream = form.kuromojiFile.getInputStream()) {
+ file.update(inputStream);
+ } catch (final IOException e) {
+ throwValidationError(messages -> messages.addErrorsFailedToUploadKuromojiFile(GLOBAL),
+ () -> redirectWith(getClass(), moreUrl("uploadpage/" + form.dictId)));
+ }
+ saveInfo(messages -> messages.addSuccessUploadKuromojiFile(GLOBAL));
+ return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
+ }).orElseGet(() -> {
+ throwValidationError(messages -> messages.addErrorsFailedToUploadKuromojiFile(GLOBAL), () -> uploadpage(form.dictId));
+ return null;
+ });
}
@@ -294,16 +280,15 @@ public class AdminDictKuromojiAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.CREATE, form.dictId);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- createKuromojiItem(form, this::asEditHtml).ifPresent(
- entity -> {
- try {
- kuromojiService.store(form.dictId, entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ createKuromojiItem(form, this::asEditHtml).ifPresent(entity -> {
+ try {
+ kuromojiService.store(form.dictId, entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
@@ -315,16 +300,15 @@ public class AdminDictKuromojiAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.EDIT, form.dictId);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- createKuromojiItem(form, this::asEditHtml).ifPresent(
- entity -> {
- try {
- kuromojiService.store(form.dictId, entity);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ createKuromojiItem(form, this::asEditHtml).ifPresent(entity -> {
+ try {
+ kuromojiService.store(form.dictId, entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), this::asEditHtml);
});
return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
@@ -336,23 +320,17 @@ public class AdminDictKuromojiAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.DETAILS, form.dictId);
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
- kuromojiService
- .getKuromojiItem(form.dictId, form.id)
- .ifPresent(
- entity -> {
- try {
- kuromojiService.delete(form.dictId, entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- })
- .orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
- this::asDetailsHtml);
- });
+ kuromojiService.getKuromojiItem(form.dictId, form.id).ifPresent(entity -> {
+ try {
+ kuromojiService.delete(form.dictId, entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), this::asDetailsHtml);
+ });
return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
}
@@ -385,7 +363,8 @@ public class AdminDictKuromojiAction extends FessAdminAction {
}
}
- public static OptionalEntity<KuromojiItem> createKuromojiItem(final FessBaseAction action, final CreateForm form, final VaErrorHook hook) {
+ public static OptionalEntity<KuromojiItem> createKuromojiItem(final FessBaseAction action, final CreateForm form,
+ final VaErrorHook hook) {
return getEntity(form).map(entity -> {
entity.setNewToken(form.token);
entity.setNewSegmentation(form.segmentation);
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/AdminDictMappingAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/AdminDictMappingAction.java
index 0b2a9de9b..96490494a 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/AdminDictMappingAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/AdminDictMappingAction.java
@@ -156,16 +156,13 @@ public class AdminDictMappingAction extends FessAdminAction {
@Secured({ ROLE })
public HtmlResponse edit(final EditForm form) {
validate(form, messages -> {}, () -> asListHtml(form.dictId));
- charMappingService
- .getCharMappingItem(form.dictId, form.id)
- .ifPresent(entity -> {
- form.inputs = entity.getInputsValue();
- form.output = entity.getOutput();
- })
- .orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
- () -> asListHtml(form.dictId));
- });
+ charMappingService.getCharMappingItem(form.dictId, form.id).ifPresent(entity -> {
+ form.inputs = entity.getInputsValue();
+ form.output = entity.getOutput();
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
+ () -> asListHtml(form.dictId));
+ });
saveToken();
if (form.crudMode.intValue() == CrudMode.EDIT) {
// back
@@ -185,26 +182,20 @@ public class AdminDictMappingAction extends FessAdminAction {
public HtmlResponse details(final String dictId, final int crudMode, final long id) {
verifyCrudMode(crudMode, CrudMode.DETAILS, dictId);
saveToken();
- return asDetailsHtml().useForm(
- EditForm.class,
- op -> {
- op.setup(form -> {
- charMappingService
- .getCharMappingItem(dictId, id)
- .ifPresent(entity -> {
- form.inputs = entity.getInputsValue();
- form.output = entity.getOutput();
- })
- .orElse(() -> {
- throwValidationError(
- messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, dictId + ":" + id),
- () -> asListHtml(dictId));
- });
- form.id = id;
- form.crudMode = crudMode;
- form.dictId = dictId;
- });
+ return asDetailsHtml().useForm(EditForm.class, op -> {
+ op.setup(form -> {
+ charMappingService.getCharMappingItem(dictId, id).ifPresent(entity -> {
+ form.inputs = entity.getInputsValue();
+ form.output = entity.getOutput();
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, dictId + ":" + id),
+ () -> asListHtml(dictId));
});
+ form.id = id;
+ form.crudMode = crudMode;
+ form.dictId = dictId;
+ });
+ });
}
// -----------------------------------------------------
@@ -232,17 +223,14 @@ public class AdminDictMappingAction extends FessAdminAction {
public ActionResponse download(final DownloadForm form) {
validate(form, messages -> {}, () -> downloadpage(form.dictId));
verifyTokenKeep(() -> downloadpage(form.dictId));
- return charMappingService
- .getCharMappingFile(form.dictId)
+ return charMappingService.getCharMappingFile(form.dictId)
.map(file -> asStream(new File(file.getPath()).getName()).contentTypeOctetStream().stream(out -> {
file.writeOut(out);
- }))
- .orElseGet(
- () -> {
- throwValidationError(messages -> messages.addErrorsFailedToDownloadMappingFile(GLOBAL),
- () -> downloadpage(form.dictId));
- return null;
- });
+ })).orElseGet(() -> {
+ throwValidationError(messages -> messages.addErrorsFailedToDownloadMappingFile(GLOBAL),
+ () -> downloadpage(form.dictId));
+ return null;
+ });
}
// -----------------------------------------------------
@@ -270,21 +258,19 @@ public class AdminDictMappingAction extends FessAdminAction {
public HtmlResponse upload(final UploadForm form) {
validate(form, messages -> {}, () -> uploadpage(form.dictId));
verifyToken(() -> uploadpage(form.dictId));
- return charMappingService
- .getCharMappingFile(form.dictId)
- .map(file -> {
- try (InputStream inputStream = form.charMappingFile.getInputStream()) {
- file.update(inputStream);
- } catch (final IOException e) {
- throwValidationError(messages -> messages.addErrorsFailedToUploadMappingFile(GLOBAL),
- () -> redirectWith(getClass(), moreUrl("uploadpage/" + form.dictId)));
- }
- saveInfo(messages -> messages.addSuccessUploadMappingFile(GLOBAL));
- return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
- }).orElseGet(() -> {
- throwValidationError(messages -> messages.addErrorsFailedToUploadMappingFile(GLOBAL), () -> uploadpage(form.dictId));
- return null;
- });
+ return charMappingService.getCharMappingFile(form.dictId).map(file -> {
+ try (InputStream inputStream = form.charMappingFile.getInputStream()) {
+ file.update(inputStream);
+ } catch (final IOException e) {
+ throwValidationError(messages -> messages.addErrorsFailedToUploadMappingFile(GLOBAL),
+ () -> redirectWith(getClass(), moreUrl("uploadpage/" + form.dictId)));
+ }
+ saveInfo(messages -> messages.addSuccessUploadMappingFile(GLOBAL));
+ return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
+ }).orElseGet(() -> {
+ throwValidationError(messages -> messages.addErrorsFailedToUploadMappingFile(GLOBAL), () -> uploadpage(form.dictId));
+ return null;
+ });
}
@@ -297,16 +283,15 @@ public class AdminDictMappingAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.CREATE, form.dictId);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- createCharMappingItem(form, this::asEditHtml).ifPresent(
- entity -> {
- try {
- charMappingService.store(form.dictId, entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ createCharMappingItem(form, this::asEditHtml).ifPresent(entity -> {
+ try {
+ charMappingService.store(form.dictId, entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
@@ -318,16 +303,15 @@ public class AdminDictMappingAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.EDIT, form.dictId);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- createCharMappingItem(form, this::asEditHtml).ifPresent(
- entity -> {
- try {
- charMappingService.store(form.dictId, entity);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ createCharMappingItem(form, this::asEditHtml).ifPresent(entity -> {
+ try {
+ charMappingService.store(form.dictId, entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), this::asEditHtml);
});
return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
@@ -339,23 +323,17 @@ public class AdminDictMappingAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.DETAILS, form.dictId);
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
- charMappingService
- .getCharMappingItem(form.dictId, form.id)
- .ifPresent(
- entity -> {
- try {
- charMappingService.delete(form.dictId, entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- })
- .orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
- this::asDetailsHtml);
- });
+ charMappingService.getCharMappingItem(form.dictId, form.id).ifPresent(entity -> {
+ try {
+ charMappingService.delete(form.dictId, entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), this::asDetailsHtml);
+ });
return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
}
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/AdminDictProtwordsAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/AdminDictProtwordsAction.java
index 662971155..a2e2eee6c 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/AdminDictProtwordsAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/AdminDictProtwordsAction.java
@@ -153,15 +153,12 @@ public class AdminDictProtwordsAction extends FessAdminAction {
@Secured({ ROLE })
public HtmlResponse edit(final EditForm form) {
validate(form, messages -> {}, () -> asListHtml(form.dictId));
- protwordsService
- .getProtwordsItem(form.dictId, form.id)
- .ifPresent(entity -> {
- form.input = entity.getInputValue();
- })
- .orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
- () -> asListHtml(form.dictId));
- });
+ protwordsService.getProtwordsItem(form.dictId, form.id).ifPresent(entity -> {
+ form.input = entity.getInputValue();
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
+ () -> asListHtml(form.dictId));
+ });
saveToken();
if (form.crudMode.intValue() == CrudMode.EDIT) {
// back
@@ -181,25 +178,19 @@ public class AdminDictProtwordsAction extends FessAdminAction {
public HtmlResponse details(final String dictId, final int crudMode, final long id) {
verifyCrudMode(crudMode, CrudMode.DETAILS, dictId);
saveToken();
- return asDetailsHtml().useForm(
- EditForm.class,
- op -> {
- op.setup(form -> {
- protwordsService
- .getProtwordsItem(dictId, id)
- .ifPresent(entity -> {
- form.input = entity.getInputValue();
- })
- .orElse(() -> {
- throwValidationError(
- messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, dictId + ":" + id),
- () -> asListHtml(dictId));
- });
- form.id = id;
- form.crudMode = crudMode;
- form.dictId = dictId;
- });
+ return asDetailsHtml().useForm(EditForm.class, op -> {
+ op.setup(form -> {
+ protwordsService.getProtwordsItem(dictId, id).ifPresent(entity -> {
+ form.input = entity.getInputValue();
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, dictId + ":" + id),
+ () -> asListHtml(dictId));
});
+ form.id = id;
+ form.crudMode = crudMode;
+ form.dictId = dictId;
+ });
+ });
}
// -----------------------------------------------------
@@ -227,17 +218,14 @@ public class AdminDictProtwordsAction extends FessAdminAction {
public ActionResponse download(final DownloadForm form) {
validate(form, messages -> {}, () -> downloadpage(form.dictId));
verifyTokenKeep(() -> downloadpage(form.dictId));
- return protwordsService
- .getProtwordsFile(form.dictId)
+ return protwordsService.getProtwordsFile(form.dictId)
.map(file -> asStream(new File(file.getPath()).getName()).contentTypeOctetStream().stream(out -> {
file.writeOut(out);
- }))
- .orElseGet(
- () -> {
- throwValidationError(messages -> messages.addErrorsFailedToDownloadProtwordsFile(GLOBAL),
- () -> downloadpage(form.dictId));
- return null;
- });
+ })).orElseGet(() -> {
+ throwValidationError(messages -> messages.addErrorsFailedToDownloadProtwordsFile(GLOBAL),
+ () -> downloadpage(form.dictId));
+ return null;
+ });
}
// -----------------------------------------------------
@@ -265,21 +253,19 @@ public class AdminDictProtwordsAction extends FessAdminAction {
public HtmlResponse upload(final UploadForm form) {
validate(form, messages -> {}, () -> uploadpage(form.dictId));
verifyToken(() -> uploadpage(form.dictId));
- return protwordsService
- .getProtwordsFile(form.dictId)
- .map(file -> {
- try (InputStream inputStream = form.protwordsFile.getInputStream()) {
- file.update(inputStream);
- } catch (final IOException e) {
- throwValidationError(messages -> messages.addErrorsFailedToUploadProtwordsFile(GLOBAL),
- () -> redirectWith(getClass(), moreUrl("uploadpage/" + form.dictId)));
- }
- saveInfo(messages -> messages.addSuccessUploadProtwordsFile(GLOBAL));
- return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
- }).orElseGet(() -> {
- throwValidationError(messages -> messages.addErrorsFailedToUploadProtwordsFile(GLOBAL), () -> uploadpage(form.dictId));
- return null;
- });
+ return protwordsService.getProtwordsFile(form.dictId).map(file -> {
+ try (InputStream inputStream = form.protwordsFile.getInputStream()) {
+ file.update(inputStream);
+ } catch (final IOException e) {
+ throwValidationError(messages -> messages.addErrorsFailedToUploadProtwordsFile(GLOBAL),
+ () -> redirectWith(getClass(), moreUrl("uploadpage/" + form.dictId)));
+ }
+ saveInfo(messages -> messages.addSuccessUploadProtwordsFile(GLOBAL));
+ return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
+ }).orElseGet(() -> {
+ throwValidationError(messages -> messages.addErrorsFailedToUploadProtwordsFile(GLOBAL), () -> uploadpage(form.dictId));
+ return null;
+ });
}
@@ -308,9 +294,8 @@ public class AdminDictProtwordsAction extends FessAdminAction {
createProtwordsItem(form, this::asEditHtml).ifPresent(entity -> {
protwordsService.store(form.dictId, entity);
saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- }).orElse(
- () -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
- this::asEditHtml));
+ }).orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
+ this::asEditHtml));
return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
}
@@ -320,16 +305,12 @@ public class AdminDictProtwordsAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.DETAILS, form.dictId);
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
- protwordsService
- .getProtwordsItem(form.dictId, form.id)
- .ifPresent(entity -> {
- protwordsService.delete(form.dictId, entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- })
- .orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
- this::asDetailsHtml);
- });
+ protwordsService.getProtwordsItem(form.dictId, form.id).ifPresent(entity -> {
+ protwordsService.delete(form.dictId, entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), this::asDetailsHtml);
+ });
return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
}
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/AdminDictStemmeroverrideAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/AdminDictStemmeroverrideAction.java
index 1676a6364..c2fbbbc4f 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/AdminDictStemmeroverrideAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/AdminDictStemmeroverrideAction.java
@@ -154,16 +154,13 @@ public class AdminDictStemmeroverrideAction extends FessAdminAction {
@Secured({ ROLE })
public HtmlResponse edit(final EditForm form) {
validate(form, messages -> {}, () -> asListHtml(form.dictId));
- stemmerOverrideService
- .getStemmerOverrideItem(form.dictId, form.id)
- .ifPresent(entity -> {
- form.input = entity.getInput();
- form.output = entity.getOutput();
- })
- .orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
- () -> asListHtml(form.dictId));
- });
+ stemmerOverrideService.getStemmerOverrideItem(form.dictId, form.id).ifPresent(entity -> {
+ form.input = entity.getInput();
+ form.output = entity.getOutput();
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
+ () -> asListHtml(form.dictId));
+ });
saveToken();
if (form.crudMode.intValue() == CrudMode.EDIT) {
// back
@@ -183,26 +180,20 @@ public class AdminDictStemmeroverrideAction extends FessAdminAction {
public HtmlResponse details(final String dictId, final int crudMode, final long id) {
verifyCrudMode(crudMode, CrudMode.DETAILS, dictId);
saveToken();
- return asDetailsHtml().useForm(
- EditForm.class,
- op -> {
- op.setup(form -> {
- stemmerOverrideService
- .getStemmerOverrideItem(dictId, id)
- .ifPresent(entity -> {
- form.input = entity.getInput();
- form.output = entity.getOutput();
- })
- .orElse(() -> {
- throwValidationError(
- messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, dictId + ":" + id),
- () -> asListHtml(dictId));
- });
- form.id = id;
- form.crudMode = crudMode;
- form.dictId = dictId;
- });
+ return asDetailsHtml().useForm(EditForm.class, op -> {
+ op.setup(form -> {
+ stemmerOverrideService.getStemmerOverrideItem(dictId, id).ifPresent(entity -> {
+ form.input = entity.getInput();
+ form.output = entity.getOutput();
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, dictId + ":" + id),
+ () -> asListHtml(dictId));
});
+ form.id = id;
+ form.crudMode = crudMode;
+ form.dictId = dictId;
+ });
+ });
}
// -----------------------------------------------------
@@ -230,17 +221,14 @@ public class AdminDictStemmeroverrideAction extends FessAdminAction {
public ActionResponse download(final DownloadForm form) {
validate(form, messages -> {}, () -> downloadpage(form.dictId));
verifyTokenKeep(() -> downloadpage(form.dictId));
- return stemmerOverrideService
- .getStemmerOverrideFile(form.dictId)
+ return stemmerOverrideService.getStemmerOverrideFile(form.dictId)
.map(file -> asStream(new File(file.getPath()).getName()).contentTypeOctetStream().stream(out -> {
file.writeOut(out);
- }))
- .orElseGet(
- () -> {
- throwValidationError(messages -> messages.addErrorsFailedToDownloadStemmeroverrideFile(GLOBAL),
- () -> downloadpage(form.dictId));
- return null;
- });
+ })).orElseGet(() -> {
+ throwValidationError(messages -> messages.addErrorsFailedToDownloadStemmeroverrideFile(GLOBAL),
+ () -> downloadpage(form.dictId));
+ return null;
+ });
}
// -----------------------------------------------------
@@ -268,24 +256,19 @@ public class AdminDictStemmeroverrideAction extends FessAdminAction {
public HtmlResponse upload(final UploadForm form) {
validate(form, messages -> {}, () -> uploadpage(form.dictId));
verifyToken(() -> uploadpage(form.dictId));
- return stemmerOverrideService
- .getStemmerOverrideFile(form.dictId)
- .map(file -> {
- try (InputStream inputStream = form.stemmerOverrideFile.getInputStream()) {
- file.update(inputStream);
- } catch (final IOException e) {
- throwValidationError(messages -> messages.addErrorsFailedToUploadStemmeroverrideFile(GLOBAL),
- () -> redirectWith(getClass(), moreUrl("uploadpage/" + form.dictId)));
- }
- saveInfo(messages -> messages.addSuccessUploadStemmeroverrideFile(GLOBAL));
- return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
- })
- .orElseGet(
- () -> {
- throwValidationError(messages -> messages.addErrorsFailedToUploadStemmeroverrideFile(GLOBAL),
- () -> uploadpage(form.dictId));
- return null;
- });
+ return stemmerOverrideService.getStemmerOverrideFile(form.dictId).map(file -> {
+ try (InputStream inputStream = form.stemmerOverrideFile.getInputStream()) {
+ file.update(inputStream);
+ } catch (final IOException e) {
+ throwValidationError(messages -> messages.addErrorsFailedToUploadStemmeroverrideFile(GLOBAL),
+ () -> redirectWith(getClass(), moreUrl("uploadpage/" + form.dictId)));
+ }
+ saveInfo(messages -> messages.addSuccessUploadStemmeroverrideFile(GLOBAL));
+ return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
+ }).orElseGet(() -> {
+ throwValidationError(messages -> messages.addErrorsFailedToUploadStemmeroverrideFile(GLOBAL), () -> uploadpage(form.dictId));
+ return null;
+ });
}
@@ -298,16 +281,15 @@ public class AdminDictStemmeroverrideAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.CREATE, form.dictId);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- createStemmerOverrideItem(form, this::asEditHtml).ifPresent(
- entity -> {
- try {
- stemmerOverrideService.store(form.dictId, entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ createStemmerOverrideItem(form, this::asEditHtml).ifPresent(entity -> {
+ try {
+ stemmerOverrideService.store(form.dictId, entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
@@ -319,16 +301,15 @@ public class AdminDictStemmeroverrideAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.EDIT, form.dictId);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- createStemmerOverrideItem(form, this::asEditHtml).ifPresent(
- entity -> {
- try {
- stemmerOverrideService.store(form.dictId, entity);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ createStemmerOverrideItem(form, this::asEditHtml).ifPresent(entity -> {
+ try {
+ stemmerOverrideService.store(form.dictId, entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
saveToken();
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), this::asEditHtml);
});
@@ -341,23 +322,17 @@ public class AdminDictStemmeroverrideAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.DETAILS, form.dictId);
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
- stemmerOverrideService
- .getStemmerOverrideItem(form.dictId, form.id)
- .ifPresent(
- entity -> {
- try {
- stemmerOverrideService.delete(form.dictId, entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- })
- .orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
- this::asDetailsHtml);
- });
+ stemmerOverrideService.getStemmerOverrideItem(form.dictId, form.id).ifPresent(entity -> {
+ try {
+ stemmerOverrideService.delete(form.dictId, entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), this::asDetailsHtml);
+ });
return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
}
@@ -419,11 +394,10 @@ public class AdminDictStemmeroverrideAction extends FessAdminAction {
}
private HtmlResponse asListHtml(final String dictId) {
- return asHtml(path_AdminDictStemmeroverride_AdminDictStemmeroverrideJsp).renderWith(
- data -> {
- RenderDataUtil.register(data, "stemmerOverrideItemItems",
- stemmerOverrideService.getStemmerOverrideList(dictId, stemmerOverridePager));
- }).useForm(SearchForm.class, setup -> {
+ return asHtml(path_AdminDictStemmeroverride_AdminDictStemmeroverrideJsp).renderWith(data -> {
+ RenderDataUtil.register(data, "stemmerOverrideItemItems",
+ stemmerOverrideService.getStemmerOverrideList(dictId, stemmerOverridePager));
+ }).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(stemmerOverridePager, form, op -> op.include("id"));
});
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/AdminDictStopwordsAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/AdminDictStopwordsAction.java
index d3a0a3d0b..dbe1f4aea 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/AdminDictStopwordsAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/AdminDictStopwordsAction.java
@@ -151,15 +151,12 @@ public class AdminDictStopwordsAction extends FessAdminAction {
@Secured({ ROLE })
public HtmlResponse edit(final EditForm form) {
validate(form, messages -> {}, () -> asListHtml(form.dictId));
- stopwordsService
- .getStopwordsItem(form.dictId, form.id)
- .ifPresent(entity -> {
- form.input = entity.getInputValue();
- })
- .orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
- () -> asListHtml(form.dictId));
- });
+ stopwordsService.getStopwordsItem(form.dictId, form.id).ifPresent(entity -> {
+ form.input = entity.getInputValue();
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
+ () -> asListHtml(form.dictId));
+ });
saveToken();
if (form.crudMode.intValue() == CrudMode.EDIT) {
// back
@@ -179,25 +176,19 @@ public class AdminDictStopwordsAction extends FessAdminAction {
public HtmlResponse details(final String dictId, final int crudMode, final long id) {
verifyCrudMode(crudMode, CrudMode.DETAILS, dictId);
saveToken();
- return asDetailsHtml().useForm(
- EditForm.class,
- op -> {
- op.setup(form -> {
- stopwordsService
- .getStopwordsItem(dictId, id)
- .ifPresent(entity -> {
- form.input = entity.getInputValue();
- })
- .orElse(() -> {
- throwValidationError(
- messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, dictId + ":" + id),
- () -> asListHtml(dictId));
- });
- form.id = id;
- form.crudMode = crudMode;
- form.dictId = dictId;
- });
+ return asDetailsHtml().useForm(EditForm.class, op -> {
+ op.setup(form -> {
+ stopwordsService.getStopwordsItem(dictId, id).ifPresent(entity -> {
+ form.input = entity.getInputValue();
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, dictId + ":" + id),
+ () -> asListHtml(dictId));
});
+ form.id = id;
+ form.crudMode = crudMode;
+ form.dictId = dictId;
+ });
+ });
}
// -----------------------------------------------------
@@ -225,17 +216,14 @@ public class AdminDictStopwordsAction extends FessAdminAction {
public ActionResponse download(final DownloadForm form) {
validate(form, messages -> {}, () -> downloadpage(form.dictId));
verifyTokenKeep(() -> downloadpage(form.dictId));
- return stopwordsService
- .getStopwordsFile(form.dictId)
+ return stopwordsService.getStopwordsFile(form.dictId)
.map(file -> asStream(new File(file.getPath()).getName()).contentTypeOctetStream().stream(out -> {
file.writeOut(out);
- }))
- .orElseGet(
- () -> {
- throwValidationError(messages -> messages.addErrorsFailedToDownloadStopwordsFile(GLOBAL),
- () -> downloadpage(form.dictId));
- return null;
- });
+ })).orElseGet(() -> {
+ throwValidationError(messages -> messages.addErrorsFailedToDownloadStopwordsFile(GLOBAL),
+ () -> downloadpage(form.dictId));
+ return null;
+ });
}
// -----------------------------------------------------
@@ -263,21 +251,19 @@ public class AdminDictStopwordsAction extends FessAdminAction {
public HtmlResponse upload(final UploadForm form) {
validate(form, messages -> {}, () -> uploadpage(form.dictId));
verifyToken(() -> uploadpage(form.dictId));
- return stopwordsService
- .getStopwordsFile(form.dictId)
- .map(file -> {
- try (InputStream inputStream = form.stopwordsFile.getInputStream()) {
- file.update(inputStream);
- } catch (final IOException e) {
- throwValidationError(messages -> messages.addErrorsFailedToUploadStopwordsFile(GLOBAL),
- () -> redirectWith(getClass(), moreUrl("uploadpage/" + form.dictId)));
- }
- saveInfo(messages -> messages.addSuccessUploadStopwordsFile(GLOBAL));
- return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
- }).orElseGet(() -> {
- throwValidationError(messages -> messages.addErrorsFailedToUploadStopwordsFile(GLOBAL), () -> uploadpage(form.dictId));
- return null;
- });
+ return stopwordsService.getStopwordsFile(form.dictId).map(file -> {
+ try (InputStream inputStream = form.stopwordsFile.getInputStream()) {
+ file.update(inputStream);
+ } catch (final IOException e) {
+ throwValidationError(messages -> messages.addErrorsFailedToUploadStopwordsFile(GLOBAL),
+ () -> redirectWith(getClass(), moreUrl("uploadpage/" + form.dictId)));
+ }
+ saveInfo(messages -> messages.addSuccessUploadStopwordsFile(GLOBAL));
+ return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
+ }).orElseGet(() -> {
+ throwValidationError(messages -> messages.addErrorsFailedToUploadStopwordsFile(GLOBAL), () -> uploadpage(form.dictId));
+ return null;
+ });
}
@@ -306,9 +292,8 @@ public class AdminDictStopwordsAction extends FessAdminAction {
createStopwordsItem(form, this::asEditHtml).ifPresent(entity -> {
stopwordsService.store(form.dictId, entity);
saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- }).orElse(
- () -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
- this::asEditHtml));
+ }).orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
+ this::asEditHtml));
return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
}
@@ -318,16 +303,12 @@ public class AdminDictStopwordsAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.DETAILS, form.dictId);
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
- stopwordsService
- .getStopwordsItem(form.dictId, form.id)
- .ifPresent(entity -> {
- stopwordsService.delete(form.dictId, entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- })
- .orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
- this::asDetailsHtml);
- });
+ stopwordsService.getStopwordsItem(form.dictId, form.id).ifPresent(entity -> {
+ stopwordsService.delete(form.dictId, entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), this::asDetailsHtml);
+ });
return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
}
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java
index 344a43676..bd248005d 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java
@@ -156,16 +156,13 @@ public class AdminDictSynonymAction extends FessAdminAction {
@Secured({ ROLE })
public HtmlResponse edit(final EditForm form) {
validate(form, messages -> {}, () -> asListHtml(form.dictId));
- synonymService
- .getSynonymItem(form.dictId, form.id)
- .ifPresent(entity -> {
- form.inputs = entity.getInputsValue();
- form.outputs = entity.getOutputsValue();
- })
- .orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
- () -> asListHtml(form.dictId));
- });
+ synonymService.getSynonymItem(form.dictId, form.id).ifPresent(entity -> {
+ form.inputs = entity.getInputsValue();
+ form.outputs = entity.getOutputsValue();
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
+ () -> asListHtml(form.dictId));
+ });
saveToken();
if (form.crudMode.intValue() == CrudMode.EDIT) {
// back
@@ -185,26 +182,20 @@ public class AdminDictSynonymAction extends FessAdminAction {
public HtmlResponse details(final String dictId, final int crudMode, final long id) {
verifyCrudMode(crudMode, CrudMode.DETAILS, dictId);
saveToken();
- return asDetailsHtml().useForm(
- EditForm.class,
- op -> {
- op.setup(form -> {
- synonymService
- .getSynonymItem(dictId, id)
- .ifPresent(entity -> {
- form.inputs = entity.getInputsValue();
- form.outputs = entity.getOutputsValue();
- })
- .orElse(() -> {
- throwValidationError(
- messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, dictId + ":" + id),
- () -> asListHtml(dictId));
- });
- form.id = id;
- form.crudMode = crudMode;
- form.dictId = dictId;
- });
+ return asDetailsHtml().useForm(EditForm.class, op -> {
+ op.setup(form -> {
+ synonymService.getSynonymItem(dictId, id).ifPresent(entity -> {
+ form.inputs = entity.getInputsValue();
+ form.outputs = entity.getOutputsValue();
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, dictId + ":" + id),
+ () -> asListHtml(dictId));
});
+ form.id = id;
+ form.crudMode = crudMode;
+ form.dictId = dictId;
+ });
+ });
}
// -----------------------------------------------------
@@ -232,17 +223,14 @@ public class AdminDictSynonymAction extends FessAdminAction {
public ActionResponse download(final DownloadForm form) {
validate(form, messages -> {}, () -> downloadpage(form.dictId));
verifyTokenKeep(() -> downloadpage(form.dictId));
- return synonymService
- .getSynonymFile(form.dictId)
+ return synonymService.getSynonymFile(form.dictId)
.map(file -> asStream(new File(file.getPath()).getName()).contentTypeOctetStream().stream(out -> {
file.writeOut(out);
- }))
- .orElseGet(
- () -> {
- throwValidationError(messages -> messages.addErrorsFailedToDownloadSynonymFile(GLOBAL),
- () -> downloadpage(form.dictId));
- return null;
- });
+ })).orElseGet(() -> {
+ throwValidationError(messages -> messages.addErrorsFailedToDownloadSynonymFile(GLOBAL),
+ () -> downloadpage(form.dictId));
+ return null;
+ });
}
// -----------------------------------------------------
@@ -270,21 +258,19 @@ public class AdminDictSynonymAction extends FessAdminAction {
public HtmlResponse upload(final UploadForm form) {
validate(form, messages -> {}, () -> uploadpage(form.dictId));
verifyToken(() -> uploadpage(form.dictId));
- return synonymService
- .getSynonymFile(form.dictId)
- .map(file -> {
- try (InputStream inputStream = form.synonymFile.getInputStream()) {
- file.update(inputStream);
- } catch (final IOException e) {
- throwValidationError(messages -> messages.addErrorsFailedToUploadSynonymFile(GLOBAL),
- () -> redirectWith(getClass(), moreUrl("uploadpage/" + form.dictId)));
- }
- saveInfo(messages -> messages.addSuccessUploadSynonymFile(GLOBAL));
- return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
- }).orElseGet(() -> {
- throwValidationError(messages -> messages.addErrorsFailedToUploadSynonymFile(GLOBAL), () -> uploadpage(form.dictId));
- return null;
- });
+ return synonymService.getSynonymFile(form.dictId).map(file -> {
+ try (InputStream inputStream = form.synonymFile.getInputStream()) {
+ file.update(inputStream);
+ } catch (final IOException e) {
+ throwValidationError(messages -> messages.addErrorsFailedToUploadSynonymFile(GLOBAL),
+ () -> redirectWith(getClass(), moreUrl("uploadpage/" + form.dictId)));
+ }
+ saveInfo(messages -> messages.addSuccessUploadSynonymFile(GLOBAL));
+ return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
+ }).orElseGet(() -> {
+ throwValidationError(messages -> messages.addErrorsFailedToUploadSynonymFile(GLOBAL), () -> uploadpage(form.dictId));
+ return null;
+ });
}
@@ -297,16 +283,15 @@ public class AdminDictSynonymAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.CREATE, form.dictId);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- createSynonymItem(form, this::asEditHtml).ifPresent(
- entity -> {
- try {
- synonymService.store(form.dictId, entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ createSynonymItem(form, this::asEditHtml).ifPresent(entity -> {
+ try {
+ synonymService.store(form.dictId, entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
@@ -318,16 +303,15 @@ public class AdminDictSynonymAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.EDIT, form.dictId);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- createSynonymItem(form, this::asEditHtml).ifPresent(
- entity -> {
- try {
- synonymService.store(form.dictId, entity);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ createSynonymItem(form, this::asEditHtml).ifPresent(entity -> {
+ try {
+ synonymService.store(form.dictId, entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
saveToken();
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), this::asEditHtml);
});
@@ -340,23 +324,17 @@ public class AdminDictSynonymAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.DETAILS, form.dictId);
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
- synonymService
- .getSynonymItem(form.dictId, form.id)
- .ifPresent(
- entity -> {
- try {
- synonymService.delete(form.dictId, entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- })
- .orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()),
- this::asDetailsHtml);
- });
+ synonymService.getSynonymItem(form.dictId, form.id).ifPresent(entity -> {
+ try {
+ synonymService.delete(form.dictId, entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), this::asDetailsHtml);
+ });
return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
}
@@ -389,7 +367,8 @@ public class AdminDictSynonymAction extends FessAdminAction {
}
}
- public static OptionalEntity<SynonymItem> createSynonymItem(final FessBaseAction action, final CreateForm form, final VaErrorHook hook) {
+ public static OptionalEntity<SynonymItem> createSynonymItem(final FessBaseAction action, final CreateForm form,
+ final VaErrorHook hook) {
return getEntity(form).map(entity -> {
final String[] newInputs = splitLine(form.inputs);
validateSynonymString(action, newInputs, "inputs", hook);
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java
index 08e2a7e6e..fc6f7a5af 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java
@@ -181,16 +181,15 @@ public class AdminDuplicatehostAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getDuplicateHost(form).ifPresent(
- entity -> {
- try {
- duplicateHostService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getDuplicateHost(form).ifPresent(entity -> {
+ try {
+ duplicateHostService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirect(getClass());
@@ -202,16 +201,15 @@ public class AdminDuplicatehostAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getDuplicateHost(form).ifPresent(
- entity -> {
- try {
- duplicateHostService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getDuplicateHost(form).ifPresent(entity -> {
+ try {
+ duplicateHostService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), this::asEditHtml);
});
return redirect(getClass());
@@ -224,21 +222,17 @@ public class AdminDuplicatehostAction extends FessAdminAction {
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
final String id = form.id;
- duplicateHostService
- .getDuplicateHost(id)
- .ifPresent(
- entity -> {
- try {
- duplicateHostService.delete(entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
- });
+ duplicateHostService.getDuplicateHost(id).ifPresent(entity -> {
+ try {
+ duplicateHostService.delete(entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
+ });
return redirect(getClass());
}
@@ -294,7 +288,7 @@ public class AdminDuplicatehostAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminDuplicatehost_AdminDuplicatehostJsp).renderWith(data -> {
RenderDataUtil.register(data, "duplicateHostItems", duplicateHostService.getDuplicateHostList(duplicateHostPager)); // page navi
- }).useForm(SearchForm.class, setup -> {
+ }).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(duplicateHostPager, form, op -> op.include("regularName", "duplicateHostName"));
});
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java
index 366ab1a49..db5905d19 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java
@@ -162,22 +162,17 @@ public class AdminElevatewordAction extends FessAdminAction {
public HtmlResponse edit(final EditForm form) {
validate(form, messages -> {}, this::asListHtml);
final String id = form.id;
- elevateWordService
- .getElevateWord(id)
- .ifPresent(
- entity -> {
- copyBeanToBean(entity, form, copyOp -> {
- copyOp.excludeNull();
- copyOp.exclude(Constants.PERMISSIONS);
- });
- final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- form.permissions =
- stream(entity.getPermissions()).get(
- stream -> stream.map(s -> permissionHelper.decode(s)).filter(StringUtil::isNotBlank).distinct()
- .collect(Collectors.joining("\n")));
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asListHtml);
- });
+ elevateWordService.getElevateWord(id).ifPresent(entity -> {
+ copyBeanToBean(entity, form, copyOp -> {
+ copyOp.excludeNull();
+ copyOp.exclude(Constants.PERMISSIONS);
+ });
+ final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
+ form.permissions = stream(entity.getPermissions()).get(stream -> stream.map(s -> permissionHelper.decode(s))
+ .filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asListHtml);
+ });
saveToken();
if (form.crudMode.intValue() == CrudMode.EDIT) {
// back
@@ -198,26 +193,17 @@ public class AdminElevatewordAction extends FessAdminAction {
verifyCrudMode(crudMode, CrudMode.DETAILS);
saveToken();
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- return asHtml(path_AdminElevateword_AdminElevatewordDetailsJsp).useForm(
- EditForm.class,
- op -> op.setup(form -> {
- elevateWordService
- .getElevateWord(id)
- .ifPresent(
- entity -> {
- copyBeanToBean(entity, form, copyOp -> {
- copyOp.excludeNull();
- copyOp.exclude(Constants.PERMISSIONS);
- });
- form.permissions =
- stream(entity.getPermissions()).get(
- stream -> stream.map(permissionHelper::decode).filter(StringUtil::isNotBlank)
- .distinct().collect(Collectors.joining("\n")));
- form.crudMode = crudMode;
- })
- .orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id),
- this::asListHtml));
- })).renderWith(this::registerLabels);
+ return asHtml(path_AdminElevateword_AdminElevatewordDetailsJsp).useForm(EditForm.class, op -> op.setup(form -> {
+ elevateWordService.getElevateWord(id).ifPresent(entity -> {
+ copyBeanToBean(entity, form, copyOp -> {
+ copyOp.excludeNull();
+ copyOp.exclude(Constants.PERMISSIONS);
+ });
+ form.permissions = stream(entity.getPermissions()).get(stream -> stream.map(permissionHelper::decode)
+ .filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
+ form.crudMode = crudMode;
+ }).orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asListHtml));
+ })).renderWith(this::registerLabels);
}
// -----------------------------------------------------
@@ -271,18 +257,17 @@ public class AdminElevatewordAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getElevateWord(form).ifPresent(
- entity -> {
- try {
- elevateWordService.store(entity);
- suggestHelper.addElevateWord(entity.getSuggestWord(), entity.getReading(), entity.getLabelTypeValues(),
- entity.getPermissions(), entity.getBoost(), false);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getElevateWord(form).ifPresent(entity -> {
+ try {
+ elevateWordService.store(entity);
+ suggestHelper.addElevateWord(entity.getSuggestWord(), entity.getReading(), entity.getLabelTypeValues(),
+ entity.getPermissions(), entity.getBoost(), false);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirect(getClass());
@@ -294,18 +279,17 @@ public class AdminElevatewordAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getElevateWord(form).ifPresent(
- entity -> {
- try {
- elevateWordService.store(entity);
- suggestHelper.deleteAllElevateWord(false);
- suggestHelper.storeAllElevateWords(false);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getElevateWord(form).ifPresent(entity -> {
+ try {
+ elevateWordService.store(entity);
+ suggestHelper.deleteAllElevateWord(false);
+ suggestHelper.storeAllElevateWords(false);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), this::asEditHtml);
});
return redirect(getClass());
@@ -318,21 +302,16 @@ public class AdminElevatewordAction extends FessAdminAction {
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
final String id = form.id;
- elevateWordService
- .getElevateWord(id)
- .ifPresent(
- entity -> {
- try {
- elevateWordService.delete(entity);
- suggestHelper.deleteElevateWord(entity.getSuggestWord(), false);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- })
- .orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml));
+ elevateWordService.getElevateWord(id).ifPresent(entity -> {
+ try {
+ elevateWordService.delete(entity);
+ suggestHelper.deleteElevateWord(entity.getSuggestWord(), false);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml));
return redirect(getClass());
}
@@ -381,18 +360,16 @@ public class AdminElevatewordAction extends FessAdminAction {
final String username = systemHelper.getUsername();
final long currentTime = systemHelper.getCurrentTimeAsLong();
- return getEntity(form, username, currentTime).map(
- entity -> {
- entity.setUpdatedBy(username);
- entity.setUpdatedTime(currentTime);
- BeanUtil.copyBeanToBean(form, entity, op -> op.exclude(Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE),
- Stream.of(Constants.PERMISSIONS)).toArray(n -> new String[n])));
- final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- entity.setPermissions(split(form.permissions, "\n").get(
- stream -> stream.map(permissionHelper::encode).filter(StringUtil::isNotBlank).distinct()
- .toArray(n -> new String[n])));
- return entity;
- });
+ return getEntity(form, username, currentTime).map(entity -> {
+ entity.setUpdatedBy(username);
+ entity.setUpdatedTime(currentTime);
+ BeanUtil.copyBeanToBean(form, entity, op -> op.exclude(Stream
+ .concat(Stream.of(Constants.COMMON_CONVERSION_RULE), Stream.of(Constants.PERMISSIONS)).toArray(n -> new String[n])));
+ final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
+ entity.setPermissions(split(form.permissions, "\n").get(
+ stream -> stream.map(permissionHelper::encode).filter(StringUtil::isNotBlank).distinct().toArray(n -> new String[n])));
+ return entity;
+ });
}
protected void registerLabels(final RenderData data) {
@@ -420,7 +397,7 @@ public class AdminElevatewordAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminElevateword_AdminElevatewordJsp).renderWith(data -> {
RenderDataUtil.register(data, "elevateWordItems", elevateWordService.getElevateWordList(elevateWordPager)); // page navi
- }).useForm(SearchForm.class, setup -> {
+ }).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(elevateWordPager, form, op -> op.include("id"));
});
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java b/src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java
index eef4325d2..a95ff90e1 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java
@@ -178,7 +178,7 @@ public class AdminFailureurlAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminFailureurl_AdminFailureurlJsp).renderWith(data -> {
RenderDataUtil.register(data, "failureUrlItems", failureUrlService.getFailureUrlList(failureUrlPager)); // page navi
- }).useForm(SearchForm.class, setup -> {
+ }).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(failureUrlPager, form, op -> op.include("url", "errorCountMin", "errorCountMax", "errorName"));
});
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java
index ed74eb495..ab0e2bf26 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java
@@ -196,16 +196,15 @@ public class AdminFileauthAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getFileAuthentication(form).ifPresent(
- entity -> {
- try {
- fileAuthenticationService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getFileAuthentication(form).ifPresent(entity -> {
+ try {
+ fileAuthenticationService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirect(getClass());
@@ -217,16 +216,15 @@ public class AdminFileauthAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getFileAuthentication(form).ifPresent(
- entity -> {
- try {
- fileAuthenticationService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getFileAuthentication(form).ifPresent(entity -> {
+ try {
+ fileAuthenticationService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), this::asEditHtml);
});
return redirect(getClass());
@@ -239,21 +237,17 @@ public class AdminFileauthAction extends FessAdminAction {
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
final String id = form.id;
- fileAuthenticationService
- .getFileAuthentication(id)
- .ifPresent(
- entity -> {
- try {
- fileAuthenticationService.delete(entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
- });
+ fileAuthenticationService.getFileAuthentication(id).ifPresent(entity -> {
+ try {
+ fileAuthenticationService.delete(entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
+ });
return redirect(getClass());
}
@@ -331,13 +325,12 @@ public class AdminFileauthAction extends FessAdminAction {
// =========
private HtmlResponse asListHtml() {
- return asHtml(path_AdminFileauth_AdminFileauthJsp).renderWith(
- data -> {
- RenderDataUtil.register(data, "fileAuthenticationItems",
- fileAuthenticationService.getFileAuthenticationList(fileAuthenticationPager)); // page navi
- RenderDataUtil.register(data, "displayCreateLink", !crawlingConfigHelper
- .getAllFileConfigList(false, false, false, null).isEmpty());
- }).useForm(SearchForm.class, setup -> {
+ return asHtml(path_AdminFileauth_AdminFileauthJsp).renderWith(data -> {
+ RenderDataUtil.register(data, "fileAuthenticationItems",
+ fileAuthenticationService.getFileAuthenticationList(fileAuthenticationPager)); // page navi
+ RenderDataUtil.register(data, "displayCreateLink",
+ !crawlingConfigHelper.getAllFileConfigList(false, false, false, null).isEmpty());
+ }).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(fileAuthenticationPager, form, op -> op.include("id"));
});
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 014a07348..3372cdf33 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
@@ -151,24 +151,16 @@ public class AdminFileconfigAction extends FessAdminAction {
validate(form, messages -> {}, this::asListHtml);
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
final String id = form.id;
- fileConfigService
- .getFileConfig(id)
- .ifPresent(
- entity -> {
- copyBeanToBean(entity, form, copyOp -> {
- copyOp.excludeNull();
- copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
- });
- form.permissions =
- stream(entity.getPermissions()).get(
- stream -> stream.map(permissionHelper::decode).filter(StringUtil::isNotBlank).distinct()
- .collect(Collectors.joining("\n")));
- form.virtualHosts =
- stream(entity.getVirtualHosts()).get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim)
- .collect(Collectors.joining("\n")));
- })
- .orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asListHtml));
+ fileConfigService.getFileConfig(id).ifPresent(entity -> {
+ copyBeanToBean(entity, form, copyOp -> {
+ copyOp.excludeNull();
+ copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
+ });
+ form.permissions = stream(entity.getPermissions()).get(stream -> stream.map(permissionHelper::decode)
+ .filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
+ form.virtualHosts = stream(entity.getVirtualHosts())
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).collect(Collectors.joining("\n")));
+ }).orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asListHtml));
saveToken();
if (form.crudMode.intValue() == CrudMode.EDIT) {
// back
@@ -188,32 +180,20 @@ public class AdminFileconfigAction extends FessAdminAction {
public HtmlResponse details(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.DETAILS);
saveToken();
- return asHtml(path_AdminFileconfig_AdminFileconfigDetailsJsp).useForm(
- EditForm.class,
- op -> op.setup(form -> {
- fileConfigService
- .getFileConfig(id)
- .ifPresent(
- entity -> {
- copyBeanToBean(entity, form, copyOp -> {
- copyOp.excludeNull();
- copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
- });
- final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- form.permissions =
- stream(entity.getPermissions()).get(
- stream -> stream.map(s -> permissionHelper.decode(s))
- .filter(StringUtil::isNotBlank).distinct()
- .collect(Collectors.joining("\n")));
- form.virtualHosts =
- stream(entity.getVirtualHosts()).get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim)
- .collect(Collectors.joining("\n")));
- form.crudMode = crudMode;
- })
- .orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id),
- this::asListHtml));
- })).renderWith(this::registerRolesAndLabels);
+ return asHtml(path_AdminFileconfig_AdminFileconfigDetailsJsp).useForm(EditForm.class, op -> op.setup(form -> {
+ fileConfigService.getFileConfig(id).ifPresent(entity -> {
+ copyBeanToBean(entity, form, copyOp -> {
+ copyOp.excludeNull();
+ copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
+ });
+ final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
+ form.permissions = stream(entity.getPermissions()).get(stream -> stream.map(s -> permissionHelper.decode(s))
+ .filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
+ form.virtualHosts = stream(entity.getVirtualHosts())
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).collect(Collectors.joining("\n")));
+ form.crudMode = crudMode;
+ }).orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asListHtml));
+ })).renderWith(this::registerRolesAndLabels);
}
// -----------------------------------------------------
@@ -225,16 +205,15 @@ public class AdminFileconfigAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getFileConfig(form).ifPresent(
- entity -> {
- try {
- fileConfigService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getFileConfig(form).ifPresent(entity -> {
+ try {
+ fileConfigService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirect(getClass());
@@ -246,16 +225,15 @@ public class AdminFileconfigAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getFileConfig(form).ifPresent(
- entity -> {
- try {
- fileConfigService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getFileConfig(form).ifPresent(entity -> {
+ try {
+ fileConfigService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), this::asEditHtml);
});
return redirect(getClass());
@@ -268,21 +246,17 @@ public class AdminFileconfigAction extends FessAdminAction {
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
final String id = form.id;
- fileConfigService
- .getFileConfig(id)
- .ifPresent(
- entity -> {
- try {
- fileConfigService.delete(entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
- });
+ fileConfigService.getFileConfig(id).ifPresent(entity -> {
+ try {
+ fileConfigService.delete(entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
+ });
return redirect(getClass());
}
@@ -312,23 +286,20 @@ public class AdminFileconfigAction extends FessAdminAction {
final SystemHelper systemHelper = ComponentUtil.getSystemHelper();
final String username = systemHelper.getUsername();
final long currentTime = systemHelper.getCurrentTimeAsLong();
- return getEntity(form, username, currentTime).map(
- entity -> {
- entity.setUpdatedBy(username);
- entity.setUpdatedTime(currentTime);
- copyBeanToBean(
- form,
- entity,
- op -> op.exclude(Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE),
- Stream.of(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS)).toArray(n -> new String[n])));
- final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- entity.setPermissions(split(form.permissions, "\n").get(
- stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).distinct()
- .toArray(n -> new String[n])));
- entity.setVirtualHosts(split(form.virtualHosts, "\n").get(
- stream -> stream.filter(StringUtil::isNotBlank).distinct().map(String::trim).toArray(n -> new String[n])));
- return entity;
- });
+ return getEntity(form, username, currentTime).map(entity -> {
+ entity.setUpdatedBy(username);
+ entity.setUpdatedTime(currentTime);
+ copyBeanToBean(form, entity,
+ op -> op.exclude(Stream
+ .concat(Stream.of(Constants.COMMON_CONVERSION_RULE), Stream.of(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS))
+ .toArray(n -> new String[n])));
+ final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
+ entity.setPermissions(split(form.permissions, "\n").get(stream -> stream.map(s -> permissionHelper.encode(s))
+ .filter(StringUtil::isNotBlank).distinct().toArray(n -> new String[n])));
+ entity.setVirtualHosts(split(form.virtualHosts, "\n")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).distinct().map(String::trim).toArray(n -> new String[n])));
+ return entity;
+ });
}
protected void registerRolesAndLabels(final RenderData data) {
@@ -355,7 +326,7 @@ public class AdminFileconfigAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminFileconfig_AdminFileconfigJsp).renderWith(data -> {
RenderDataUtil.register(data, "fileConfigItems", fileConfigService.getFileConfigList(fileConfigPager)); // page navi
- }).useForm(SearchForm.class, setup -> {
+ }).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(fileConfigPager, form, op -> op.include("name", "paths", "description"));
});
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java
index 190f6eee1..e16e65df6 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java
@@ -191,17 +191,16 @@ public class AdminGroupAction extends FessAdminAction {
validate(form, messages -> {}, this::asEditHtml);
validateAttributes(form.attributes, v -> throwValidationError(v, this::asEditHtml));
verifyToken(this::asEditHtml);
- getGroup(form).ifPresent(
- entity -> {
- try {
- groupService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- logger.error("Failed to add " + entity, e);
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getGroup(form).ifPresent(entity -> {
+ try {
+ groupService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ logger.error("Failed to add " + entity, e);
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirect(getClass());
@@ -214,17 +213,16 @@ public class AdminGroupAction extends FessAdminAction {
validate(form, messages -> {}, this::asEditHtml);
validateAttributes(form.attributes, v -> throwValidationError(v, this::asEditHtml));
verifyToken(this::asEditHtml);
- getGroup(form).ifPresent(
- entity -> {
- try {
- groupService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- logger.error("Failed to update " + entity, e);
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getGroup(form).ifPresent(entity -> {
+ try {
+ groupService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ logger.error("Failed to update " + entity, e);
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), this::asEditHtml);
});
return redirect(getClass());
@@ -237,22 +235,18 @@ public class AdminGroupAction extends FessAdminAction {
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
final String id = form.id;
- groupService
- .getGroup(id)
- .ifPresent(
- entity -> {
- try {
- groupService.delete(entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- } catch (final Exception e) {
- logger.error("Failed to delete " + entity, e);
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asDetailsHtml);
- }
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
- });
+ groupService.getGroup(id).ifPresent(entity -> {
+ try {
+ groupService.delete(entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ logger.error("Failed to delete " + entity, e);
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asDetailsHtml);
+ }
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
+ });
return redirect(getClass());
}
@@ -308,7 +302,7 @@ public class AdminGroupAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminGroup_AdminGroupJsp).renderWith(data -> {
RenderDataUtil.register(data, "groupItems", groupService.getGroupList(groupPager)); // page navi
- }).useForm(SearchForm.class, setup -> {
+ }).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(groupPager, form, op -> op.include("id"));
});
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java b/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java
index 6a87f39df..7d1347a82 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java
@@ -199,7 +199,7 @@ public class AdminJoblogAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminJoblog_AdminJoblogJsp).renderWith(data -> {
RenderDataUtil.register(data, "jobLogItems", jobLogService.getJobLogList(jobLogPager)); // page navi
- }).useForm(SearchForm.class, setup -> {
+ }).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(jobLogPager, form, op -> op.include("id"));
});
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java
index e428f4031..b21c9d9ee 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java
@@ -192,17 +192,16 @@ public class AdminKeymatchAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getKeyMatch(form).ifPresent(
- entity -> {
- try {
- keyMatchService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- ComponentUtil.getKeyMatchHelper().update();
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getKeyMatch(form).ifPresent(entity -> {
+ try {
+ keyMatchService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ ComponentUtil.getKeyMatchHelper().update();
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirect(getClass());
@@ -214,17 +213,16 @@ public class AdminKeymatchAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getKeyMatch(form).ifPresent(
- entity -> {
- try {
- keyMatchService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- ComponentUtil.getKeyMatchHelper().update();
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getKeyMatch(form).ifPresent(entity -> {
+ try {
+ keyMatchService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ ComponentUtil.getKeyMatchHelper().update();
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), this::asEditHtml);
});
return redirect(getClass());
@@ -237,22 +235,18 @@ public class AdminKeymatchAction extends FessAdminAction {
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
final String id = form.id;
- keyMatchService
- .getKeyMatch(id)
- .ifPresent(
- entity -> {
- try {
- keyMatchService.delete(entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- ComponentUtil.getKeyMatchHelper().update();
- } catch (final Exception e) {
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
- });
+ keyMatchService.getKeyMatch(id).ifPresent(entity -> {
+ try {
+ keyMatchService.delete(entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ ComponentUtil.getKeyMatchHelper().update();
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
+ });
return redirect(getClass());
}
@@ -309,7 +303,7 @@ public class AdminKeymatchAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminKeymatch_AdminKeymatchJsp).renderWith(data -> {
RenderDataUtil.register(data, "keyMatchItems", keyMatchService.getKeyMatchList(keyMatchPager)); // page navi
- }).useForm(SearchForm.class, setup -> {
+ }).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(keyMatchPager, form, op -> op.include("term", "query"));
});
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 f2037c109..c58f5ed35 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
@@ -148,22 +148,17 @@ public class AdminLabeltypeAction extends FessAdminAction {
public HtmlResponse edit(final EditForm form) {
validate(form, messages -> {}, this::asListHtml);
final String id = form.id;
- labelTypeService
- .getLabelType(id)
- .ifPresent(
- entity -> {
- copyBeanToBean(entity, form, copyOp -> {
- copyOp.excludeNull();
- copyOp.exclude(Constants.PERMISSIONS);
- });
- final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- form.permissions =
- stream(entity.getPermissions()).get(
- stream -> stream.map(s -> permissionHelper.decode(s)).filter(StringUtil::isNotBlank).distinct()
- .collect(Collectors.joining("\n")));
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asListHtml);
- });
+ labelTypeService.getLabelType(id).ifPresent(entity -> {
+ copyBeanToBean(entity, form, copyOp -> {
+ copyOp.excludeNull();
+ copyOp.exclude(Constants.PERMISSIONS);
+ });
+ final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
+ form.permissions = stream(entity.getPermissions()).get(stream -> stream.map(s -> permissionHelper.decode(s))
+ .filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asListHtml);
+ });
saveToken();
if (form.crudMode.intValue() == CrudMode.EDIT) {
// back
@@ -183,32 +178,22 @@ public class AdminLabeltypeAction extends FessAdminAction {
public HtmlResponse details(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.DETAILS);
saveToken();
- return asHtml(path_AdminLabeltype_AdminLabeltypeDetailsJsp).useForm(
- EditForm.class,
- op -> {
- op.setup(form -> {
- labelTypeService
- .getLabelType(id)
- .ifPresent(
- entity -> {
- copyBeanToBean(entity, form, copyOp -> {
- copyOp.excludeNull();
- copyOp.exclude(Constants.PERMISSIONS);
- });
- final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- form.permissions =
- stream(entity.getPermissions()).get(
- stream -> stream.map(s -> permissionHelper.decode(s))
- .filter(StringUtil::isNotBlank).distinct()
- .collect(Collectors.joining("\n")));
- form.crudMode = crudMode;
- })
- .orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id),
- this::asListHtml);
- });
+ return asHtml(path_AdminLabeltype_AdminLabeltypeDetailsJsp).useForm(EditForm.class, op -> {
+ op.setup(form -> {
+ labelTypeService.getLabelType(id).ifPresent(entity -> {
+ copyBeanToBean(entity, form, copyOp -> {
+ copyOp.excludeNull();
+ copyOp.exclude(Constants.PERMISSIONS);
});
- }).renderWith(data -> {
+ final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
+ form.permissions = stream(entity.getPermissions()).get(stream -> stream.map(s -> permissionHelper.decode(s))
+ .filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
+ form.crudMode = crudMode;
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asListHtml);
+ });
+ });
+ }).renderWith(data -> {
registerRoleTypeItems(data);
});
}
@@ -222,16 +207,15 @@ public class AdminLabeltypeAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getLabelType(form).ifPresent(
- entity -> {
- try {
- labelTypeService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getLabelType(form).ifPresent(entity -> {
+ try {
+ labelTypeService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirect(getClass());
@@ -243,16 +227,15 @@ public class AdminLabeltypeAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getLabelType(form).ifPresent(
- entity -> {
- try {
- labelTypeService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getLabelType(form).ifPresent(entity -> {
+ try {
+ labelTypeService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), this::asEditHtml);
});
return redirect(getClass());
@@ -265,21 +248,17 @@ public class AdminLabeltypeAction extends FessAdminAction {
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
final String id = form.id;
- labelTypeService
- .getLabelType(id)
- .ifPresent(
- entity -> {
- try {
- labelTypeService.delete(entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
- });
+ labelTypeService.getLabelType(id).ifPresent(entity -> {
+ try {
+ labelTypeService.delete(entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
+ });
return redirect(getClass());
}
@@ -310,18 +289,16 @@ public class AdminLabeltypeAction extends FessAdminAction {
final SystemHelper systemHelper = ComponentUtil.getSystemHelper();
final String username = systemHelper.getUsername();
final long currentTime = systemHelper.getCurrentTimeAsLong();
- return getEntity(form, username, currentTime).map(
- entity -> {
- entity.setUpdatedBy(username);
- entity.setUpdatedTime(currentTime);
- copyBeanToBean(form, entity, op -> op.exclude(Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE),
- Stream.of(Constants.PERMISSIONS)).toArray(n -> new String[n])));
- final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- entity.setPermissions(split(form.permissions, "\n").get(
- stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).distinct()
- .toArray(n -> new String[n])));
- return entity;
- });
+ return getEntity(form, username, currentTime).map(entity -> {
+ entity.setUpdatedBy(username);
+ entity.setUpdatedTime(currentTime);
+ copyBeanToBean(form, entity, op -> op.exclude(Stream
+ .concat(Stream.of(Constants.COMMON_CONVERSION_RULE), Stream.of(Constants.PERMISSIONS)).toArray(n -> new String[n])));
+ final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
+ entity.setPermissions(split(form.permissions, "\n").get(stream -> stream.map(s -> permissionHelper.encode(s))
+ .filter(StringUtil::isNotBlank).distinct().toArray(n -> new String[n])));
+ return entity;
+ });
}
protected void registerRoleTypeItems(final RenderData data) {
@@ -346,7 +323,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminLabeltype_AdminLabeltypeJsp).renderWith(data -> {
RenderDataUtil.register(data, "labelTypeItems", labelTypeService.getLabelTypeList(labelTypePager)); // page navi
- }).useForm(SearchForm.class, setup -> {
+ }).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(labelTypePager, form, op -> op.include("name", "value"));
});
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java b/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java
index 88b86558e..12c5e81a0 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java
@@ -56,9 +56,9 @@ public class AdminMaintenanceAction extends FessAdminAction {
//
private static final Logger logger = LogManager.getLogger(AdminMaintenanceAction.class);
- private static final String[] ES_CAT_NAMES = new String[] { "aliases", "allocation", "count", "fielddata", "health", "indices",
- "master", "nodeattrs", "nodes", "pending_tasks", "plugins", "recovery", "repositories", "thread_pool", "shards", "segments",
- "snapshots", "templates" };
+ private static final String[] ES_CAT_NAMES =
+ new String[] { "aliases", "allocation", "count", "fielddata", "health", "indices", "master", "nodeattrs", "nodes",
+ "pending_tasks", "plugins", "recovery", "repositories", "thread_pool", "shards", "segments", "snapshots", "templates" };
// ===================================================================================
// Attribute
@@ -117,22 +117,11 @@ public class AdminMaintenanceAction extends FessAdminAction {
validate(form, messages -> {}, this::asIndexHtml);
verifyToken(this::asIndexHtml);
final String docIndex = fessConfig.getIndexDocumentUpdateIndex();
- fessEsClient
- .admin()
- .indices()
- .prepareClose(docIndex)
- .execute(
- ActionListener.wrap(
- res -> {
- logger.info("Close {}", docIndex);
- fessEsClient
- .admin()
- .indices()
- .prepareOpen(docIndex)
- .execute(
- ActionListener.wrap(res2 -> logger.info("Open {}", docIndex),
- e -> logger.warn("Failed to open " + docIndex, e)));
- }, e -> logger.warn("Failed to close " + docIndex, e)));
+ fessEsClient.admin().indices().prepareClose(docIndex).execute(ActionListener.wrap(res -> {
+ logger.info("Close {}", docIndex);
+ fessEsClient.admin().indices().prepareOpen(docIndex).execute(
+ ActionListener.wrap(res2 -> logger.info("Open {}", docIndex), e -> logger.warn("Failed to open " + docIndex, e)));
+ }, e -> logger.warn("Failed to close " + docIndex, e)));
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
return redirect(getClass());
}
@@ -142,16 +131,12 @@ public class AdminMaintenanceAction extends FessAdminAction {
public HtmlResponse clearCrawlerIndex(final ActionForm form) {
validate(form, messages -> {}, this::asIndexHtml);
verifyToken(this::asIndexHtml);
- fessEsClient
- .admin()
- .indices()
- .prepareDelete(//
- fessConfig.getIndexDocumentCrawlerIndex() + ".queue", //
- fessConfig.getIndexDocumentCrawlerIndex() + ".data", //
- fessConfig.getIndexDocumentCrawlerIndex() + ".filter")
- .execute(
- ActionListener.wrap(res -> logger.info("Deleted .crawler indices."),
- e -> logger.warn("Failed to delete .crawler.* indices.", e)));
+ fessEsClient.admin().indices().prepareDelete(//
+ fessConfig.getIndexDocumentCrawlerIndex() + ".queue", //
+ fessConfig.getIndexDocumentCrawlerIndex() + ".data", //
+ fessConfig.getIndexDocumentCrawlerIndex() + ".filter")
+ .execute(ActionListener.wrap(res -> logger.info("Deleted .crawler indices."),
+ e -> logger.warn("Failed to delete .crawler.* indices.", e)));
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
return redirect(getClass());
}
@@ -233,9 +218,8 @@ public class AdminMaintenanceAction extends FessAdminAction {
final ZipEntry entry = new ZipEntry(id + "/fess_basic_config.bulk");
try {
zos.putNextEntry(entry);
- try (CurlResponse response =
- ComponentUtil.getCurlHelper().get("/.fess_basic_config/_data").param("format", "json")
- .param("scroll", fessConfig.getIndexScrollSearchTimeout()).execute()) {
+ try (CurlResponse response = ComponentUtil.getCurlHelper().get("/.fess_basic_config/_data").param("format", "json")
+ .param("scroll", fessConfig.getIndexScrollSearchTimeout()).execute()) {
CopyUtil.copy(response.getContentAsStream(), zos);
}
} catch (final IOException e) {
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java
index 90b79ab0b..8146a122e 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java
@@ -182,16 +182,15 @@ public class AdminPathmapAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getPathMapping(form).ifPresent(
- entity -> {
- try {
- pathMappingService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getPathMapping(form).ifPresent(entity -> {
+ try {
+ pathMappingService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirect(getClass());
@@ -203,16 +202,15 @@ public class AdminPathmapAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getPathMapping(form).ifPresent(
- entity -> {
- try {
- pathMappingService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getPathMapping(form).ifPresent(entity -> {
+ try {
+ pathMappingService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), this::asEditHtml);
});
return redirect(getClass());
@@ -225,21 +223,17 @@ public class AdminPathmapAction extends FessAdminAction {
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
final String id = form.id;
- pathMappingService
- .getPathMapping(id)
- .ifPresent(
- entity -> {
- try {
- pathMappingService.delete(entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
- });
+ pathMappingService.getPathMapping(id).ifPresent(entity -> {
+ try {
+ pathMappingService.delete(entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
+ });
return redirect(getClass());
}
@@ -295,7 +289,7 @@ public class AdminPathmapAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminPathmap_AdminPathmapJsp).renderWith(data -> {
RenderDataUtil.register(data, "pathMappingItems", pathMappingService.getPathMappingList(pathMapPager)); // page navi
- }).useForm(SearchForm.class, setup -> {
+ }).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(pathMapPager, form, op -> op.include("regex", "replacement"));
});
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/plugin/AdminPluginAction.java b/src/main/java/org/codelibs/fess/app/web/admin/plugin/AdminPluginAction.java
index 6d1cad52e..2f43f4c6e 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/plugin/AdminPluginAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/plugin/AdminPluginAction.java
@@ -87,7 +87,8 @@ public class AdminPluginAction extends FessAdminAction {
throwValidationError(messages -> messages.addErrorsPluginFileIsNotFound(GLOBAL, form.id), this::asListHtml);
}
if (!form.jarFile.getFileName().endsWith(".jar")) {
- throwValidationError(messages -> messages.addErrorsFileIsNotSupported(GLOBAL, form.jarFile.getFileName()), this::asListHtml);
+ throwValidationError(messages -> messages.addErrorsFileIsNotSupported(GLOBAL, form.jarFile.getFileName()),
+ this::asListHtml);
}
final String filename = form.jarFile.getFileName();
final File tempFile = ComponentUtil.getSystemHelper().createTempFile("tmp-adminplugin-", ".jar");
@@ -143,8 +144,8 @@ public class AdminPluginAction extends FessAdminAction {
}
private HtmlResponse asListHtml() {
- return asHtml(path_AdminPlugin_AdminPluginJsp).renderWith(
- data -> data.register("installedArtifactItems", getAllInstalledArtifacts())).useForm(DeleteForm.class);
+ return asHtml(path_AdminPlugin_AdminPluginJsp)
+ .renderWith(data -> data.register("installedArtifactItems", getAllInstalledArtifacts())).useForm(DeleteForm.class);
}
public static List<Map<String, String>> getAllAvailableArtifacts() {
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/AdminRelatedcontentAction.java b/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/AdminRelatedcontentAction.java
index 7b4bd9274..482ab2169 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/AdminRelatedcontentAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/AdminRelatedcontentAction.java
@@ -181,16 +181,15 @@ public class AdminRelatedcontentAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getRelatedContent(form).ifPresent(
- entity -> {
- try {
- relatedContentService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getRelatedContent(form).ifPresent(entity -> {
+ try {
+ relatedContentService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirect(getClass());
@@ -202,16 +201,15 @@ public class AdminRelatedcontentAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getRelatedContent(form).ifPresent(
- entity -> {
- try {
- relatedContentService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getRelatedContent(form).ifPresent(entity -> {
+ try {
+ relatedContentService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), this::asEditHtml);
});
return redirect(getClass());
@@ -224,21 +222,17 @@ public class AdminRelatedcontentAction extends FessAdminAction {
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
final String id = form.id;
- relatedContentService
- .getRelatedContent(id)
- .ifPresent(
- entity -> {
- try {
- relatedContentService.delete(entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
- });
+ relatedContentService.getRelatedContent(id).ifPresent(entity -> {
+ try {
+ relatedContentService.delete(entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
+ });
return redirect(getClass());
}
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/AdminRelatedqueryAction.java b/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/AdminRelatedqueryAction.java
index eb3600d5c..e294ca3fc 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/AdminRelatedqueryAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/AdminRelatedqueryAction.java
@@ -141,20 +141,16 @@ public class AdminRelatedqueryAction extends FessAdminAction {
public HtmlResponse edit(final EditForm form) {
validate(form, messages -> {}, this::asListHtml);
final String id = form.id;
- relatedQueryService
- .getRelatedQuery(id)
- .ifPresent(
- entity -> {
- copyBeanToBean(entity, form, copyOp -> {
- copyOp.excludeNull();
- copyOp.exclude(Constants.QUERIES);
- });
- form.queries =
- stream(entity.getQueries()).get(
- stream -> stream.filter(StringUtil::isNotBlank).collect(Collectors.joining("\n")));
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asListHtml);
- });
+ relatedQueryService.getRelatedQuery(id).ifPresent(entity -> {
+ copyBeanToBean(entity, form, copyOp -> {
+ copyOp.excludeNull();
+ copyOp.exclude(Constants.QUERIES);
+ });
+ form.queries =
+ stream(entity.getQueries()).get(stream -> stream.filter(StringUtil::isNotBlank).collect(Collectors.joining("\n")));
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asListHtml);
+ });
saveToken();
if (form.crudMode.intValue() == CrudMode.EDIT) {
// back
@@ -174,30 +170,21 @@ public class AdminRelatedqueryAction extends FessAdminAction {
public HtmlResponse details(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.DETAILS);
saveToken();
- return asDetailsHtml().useForm(
- EditForm.class,
- op -> {
- op.setup(form -> {
- relatedQueryService
- .getRelatedQuery(id)
- .ifPresent(
- entity -> {
- copyBeanToBean(entity, form, copyOp -> {
- copyOp.excludeNull();
- copyOp.exclude(Constants.QUERIES);
- });
- form.queries =
- stream(entity.getQueries()).get(
- stream -> stream.filter(StringUtil::isNotBlank).collect(
- Collectors.joining("\n")));
- form.crudMode = crudMode;
- })
- .orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id),
- this::asListHtml);
- });
+ return asDetailsHtml().useForm(EditForm.class, op -> {
+ op.setup(form -> {
+ relatedQueryService.getRelatedQuery(id).ifPresent(entity -> {
+ copyBeanToBean(entity, form, copyOp -> {
+ copyOp.excludeNull();
+ copyOp.exclude(Constants.QUERIES);
});
+ form.queries = stream(entity.getQueries())
+ .get(stream -> stream.filter(StringUtil::isNotBlank).collect(Collectors.joining("\n")));
+ form.crudMode = crudMode;
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asListHtml);
});
+ });
+ });
}
// -----------------------------------------------------
@@ -209,16 +196,15 @@ public class AdminRelatedqueryAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getRelatedQuery(form).ifPresent(
- entity -> {
- try {
- relatedQueryService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getRelatedQuery(form).ifPresent(entity -> {
+ try {
+ relatedQueryService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirect(getClass());
@@ -230,16 +216,15 @@ public class AdminRelatedqueryAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getRelatedQuery(form).ifPresent(
- entity -> {
- try {
- relatedQueryService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getRelatedQuery(form).ifPresent(entity -> {
+ try {
+ relatedQueryService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), this::asEditHtml);
});
return redirect(getClass());
@@ -252,21 +237,17 @@ public class AdminRelatedqueryAction extends FessAdminAction {
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
final String id = form.id;
- relatedQueryService
- .getRelatedQuery(id)
- .ifPresent(
- entity -> {
- try {
- relatedQueryService.delete(entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
- });
+ relatedQueryService.getRelatedQuery(id).ifPresent(entity -> {
+ try {
+ relatedQueryService.delete(entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
+ });
return redirect(getClass());
}
@@ -297,16 +278,14 @@ public class AdminRelatedqueryAction extends FessAdminAction {
final SystemHelper systemHelper = ComponentUtil.getSystemHelper();
final String username = systemHelper.getUsername();
final long currentTime = systemHelper.getCurrentTimeAsLong();
- return getEntity(form, username, currentTime).map(
- entity -> {
- entity.setUpdatedBy(username);
- entity.setUpdatedTime(currentTime);
- BeanUtil.copyBeanToBean(form, entity, op -> op.exclude(Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE),
- Stream.of(Constants.QUERIES)).toArray(n -> new String[n])));
- entity.setQueries(split(form.queries, "\n").get(
- stream -> stream.filter(StringUtil::isNotBlank).toArray(n -> new String[n])));
- return entity;
- });
+ return getEntity(form, username, currentTime).map(entity -> {
+ entity.setUpdatedBy(username);
+ entity.setUpdatedTime(currentTime);
+ BeanUtil.copyBeanToBean(form, entity, op -> op.exclude(
+ Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE), Stream.of(Constants.QUERIES)).toArray(n -> new String[n])));
+ entity.setQueries(split(form.queries, "\n").get(stream -> stream.filter(StringUtil::isNotBlank).toArray(n -> new String[n])));
+ return entity;
+ });
}
// ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java
index 6c5f1fc12..ed9946639 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java
@@ -194,16 +194,15 @@ public class AdminReqheaderAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getRequestHeader(form).ifPresent(
- entity -> {
- try {
- requestHeaderService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getRequestHeader(form).ifPresent(entity -> {
+ try {
+ requestHeaderService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirect(getClass());
@@ -215,16 +214,15 @@ public class AdminReqheaderAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getRequestHeader(form).ifPresent(
- entity -> {
- try {
- requestHeaderService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getRequestHeader(form).ifPresent(entity -> {
+ try {
+ requestHeaderService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), this::asEditHtml);
});
return redirect(getClass());
@@ -237,21 +235,17 @@ public class AdminReqheaderAction extends FessAdminAction {
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
final String id = form.id;
- requestHeaderService
- .getRequestHeader(id)
- .ifPresent(
- entity -> {
- try {
- requestHeaderService.delete(entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
- });
+ requestHeaderService.getRequestHeader(id).ifPresent(entity -> {
+ try {
+ requestHeaderService.delete(entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
+ });
return redirect(getClass());
}
@@ -323,9 +317,9 @@ public class AdminReqheaderAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminReqheader_AdminReqheaderJsp).renderWith(data -> {
RenderDataUtil.register(data, "requestHeaderItems", requestHeaderService.getRequestHeaderList(reqHeaderPager)); // page navi
- RenderDataUtil.register(data, "displayCreateLink", !crawlingConfigHelper.getAllWebConfigList(false, false, false, null)
- .isEmpty());
- }).useForm(SearchForm.class, setup -> {
+ RenderDataUtil.register(data, "displayCreateLink",
+ !crawlingConfigHelper.getAllWebConfigList(false, false, false, null).isEmpty());
+ }).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(reqHeaderPager, form, op -> op.include("id"));
});
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java
index 1d4ca02c7..d214ed48b 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java
@@ -165,17 +165,16 @@ public class AdminRoleAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getRole(form).ifPresent(
- entity -> {
- try {
- roleService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- logger.error("Failed to add " + entity, e);
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getRole(form).ifPresent(entity -> {
+ try {
+ roleService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ logger.error("Failed to add " + entity, e);
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirect(getClass());
@@ -249,7 +248,7 @@ public class AdminRoleAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminRole_AdminRoleJsp).renderWith(data -> {
RenderDataUtil.register(data, "roleItems", roleService.getRoleList(rolePager)); // page navi
- }).useForm(SearchForm.class, setup -> {
+ }).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(rolePager, form, op -> op.include("id"));
});
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java
index 0d4333b6a..e38d30ff0 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java
@@ -129,30 +129,28 @@ public class AdminSchedulerAction extends FessAdminAction {
@Secured({ ROLE })
public HtmlResponse createnewjob(final String type, final String id, final String name) {
saveToken();
- return asHtml(path_AdminScheduler_AdminSchedulerEditJsp).useForm(
- CreateForm.class,
- op -> {
- op.setup(scheduledJobForm -> {
- scheduledJobForm.initialize();
- scheduledJobForm.crudMode = CrudMode.CREATE;
- scheduledJobForm.jobLogging = Constants.ON;
- scheduledJobForm.crawler = Constants.ON;
- scheduledJobForm.available = Constants.ON;
- scheduledJobForm.cronExpression = null;
- final String decodedName = new String(Base64.getUrlDecoder().decode(name), Constants.CHARSET_UTF_8);
- scheduledJobForm.name = MessageFormat.format(fessConfig.getJobTemplateTitle(type), decodedName);
- final String[] ids = new String[] { "", "", "" };
- if (Constants.WEB_CRAWLER_TYPE.equals(type)) {
- ids[0] = "\"" + id + "\"";
- } else if (Constants.FILE_CRAWLER_TYPE.equals(type)) {
- ids[1] = "\"" + id + "\"";
- } else if (Constants.DATA_CRAWLER_TYPE.equals(type)) {
- ids[2] = "\"" + id + "\"";
- }
- scheduledJobForm.scriptData =
- MessageFormat.format(fessConfig.getJobTemplateScript(), ids[0], ids[1], ids[2], id.replace('-', '_'));
- });
- });
+ return asHtml(path_AdminScheduler_AdminSchedulerEditJsp).useForm(CreateForm.class, op -> {
+ op.setup(scheduledJobForm -> {
+ scheduledJobForm.initialize();
+ scheduledJobForm.crudMode = CrudMode.CREATE;
+ scheduledJobForm.jobLogging = Constants.ON;
+ scheduledJobForm.crawler = Constants.ON;
+ scheduledJobForm.available = Constants.ON;
+ scheduledJobForm.cronExpression = null;
+ final String decodedName = new String(Base64.getUrlDecoder().decode(name), Constants.CHARSET_UTF_8);
+ scheduledJobForm.name = MessageFormat.format(fessConfig.getJobTemplateTitle(type), decodedName);
+ final String[] ids = new String[] { "", "", "" };
+ if (Constants.WEB_CRAWLER_TYPE.equals(type)) {
+ ids[0] = "\"" + id + "\"";
+ } else if (Constants.FILE_CRAWLER_TYPE.equals(type)) {
+ ids[1] = "\"" + id + "\"";
+ } else if (Constants.DATA_CRAWLER_TYPE.equals(type)) {
+ ids[2] = "\"" + id + "\"";
+ }
+ scheduledJobForm.scriptData =
+ MessageFormat.format(fessConfig.getJobTemplateScript(), ids[0], ids[1], ids[2], id.replace('-', '_'));
+ });
+ });
}
@Execute
@@ -223,16 +221,15 @@ public class AdminSchedulerAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getScheduledJob(form).ifPresent(
- entity -> {
- try {
- scheduledJobService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getScheduledJob(form).ifPresent(entity -> {
+ try {
+ scheduledJobService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirect(getClass());
@@ -244,16 +241,15 @@ public class AdminSchedulerAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getScheduledJob(form).ifPresent(
- entity -> {
- try {
- scheduledJobService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getScheduledJob(form).ifPresent(entity -> {
+ try {
+ scheduledJobService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), this::asEditHtml);
});
return redirect(getClass());
@@ -266,21 +262,17 @@ public class AdminSchedulerAction extends FessAdminAction {
final String id = form.id;
validate(form, messages -> {}, () -> asDetailsHtml(id));
verifyToken(() -> asDetailsHtml(id));
- scheduledJobService
- .getScheduledJob(id)
- .ifPresent(
- entity -> {
- try {
- scheduledJobService.delete(entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml(id));
- });
+ scheduledJobService.getScheduledJob(id).ifPresent(entity -> {
+ try {
+ scheduledJobService.delete(entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml(id));
+ });
return redirect(getClass());
}
@@ -399,7 +391,7 @@ public class AdminSchedulerAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminScheduler_AdminSchedulerJsp).renderWith(data -> {
RenderDataUtil.register(data, "scheduledJobItems", scheduledJobService.getScheduledJobList(schedulerPager)); // page navi
- }).useForm(SearchForm.class, setup -> {
+ }).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(schedulerPager, form, op -> op.include("id"));
});
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java
index e3aaf7365..20c68cd33 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java
@@ -272,23 +272,22 @@ public class AdminSearchlistAction extends FessAdminAction {
validate(form, messages -> {}, this::asEditHtml);
validateFields(form, v -> throwValidationError(v, this::asEditHtml));
verifyToken(this::asEditHtml);
- getDoc(form).ifPresent(
- entity -> {
- try {
- entity.putAll(fessConfig.convertToStorableDoc(form.doc));
-
- final String newId = ComponentUtil.getCrawlingInfoHelper().generateId(entity);
- entity.put(fessConfig.getIndexFieldId(), newId);
-
- final String index = fessConfig.getIndexDocumentUpdateIndex();
- fessEsClient.store(index, entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- logger.error("Failed to add " + entity, e);
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getDoc(form).ifPresent(entity -> {
+ try {
+ entity.putAll(fessConfig.convertToStorableDoc(form.doc));
+
+ final String newId = ComponentUtil.getCrawlingInfoHelper().generateId(entity);
+ entity.put(fessConfig.getIndexFieldId(), newId);
+
+ final String index = fessConfig.getIndexDocumentUpdateIndex();
+ fessEsClient.store(index, entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ logger.error("Failed to add " + entity, e);
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirect(getClass());
@@ -301,32 +300,31 @@ public class AdminSearchlistAction extends FessAdminAction {
validate(form, messages -> {}, this::asEditHtml);
validateFields(form, v -> throwValidationError(v, this::asEditHtml));
verifyToken(this::asEditHtml);
- getDoc(form).ifPresent(
- entity -> {
- final String index = fessConfig.getIndexDocumentUpdateIndex();
- try {
- entity.putAll(fessConfig.convertToStorableDoc(form.doc));
-
- final String newId = ComponentUtil.getCrawlingInfoHelper().generateId(entity);
- final String oldId = (String) entity.get(fessConfig.getIndexFieldId());
- if (!newId.equals(oldId)) {
- entity.put(fessConfig.getIndexFieldId(), newId);
- entity.remove(fessConfig.getIndexFieldVersion());
- final Long seqNo = (Long) entity.remove(fessConfig.getIndexFieldSeqNo());
- final Long primaryTerm = (Long) entity.remove(fessConfig.getIndexFieldPrimaryTerm());
- if (seqNo != null && primaryTerm != null && oldId != null) {
- fessEsClient.delete(index, oldId, seqNo, primaryTerm);
- }
- }
-
- fessEsClient.store(index, entity);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- logger.error("Failed to update " + entity, e);
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
+ getDoc(form).ifPresent(entity -> {
+ final String index = fessConfig.getIndexDocumentUpdateIndex();
+ try {
+ entity.putAll(fessConfig.convertToStorableDoc(form.doc));
+
+ final String newId = ComponentUtil.getCrawlingInfoHelper().generateId(entity);
+ final String oldId = (String) entity.get(fessConfig.getIndexFieldId());
+ if (!newId.equals(oldId)) {
+ entity.put(fessConfig.getIndexFieldId(), newId);
+ entity.remove(fessConfig.getIndexFieldVersion());
+ final Long seqNo = (Long) entity.remove(fessConfig.getIndexFieldSeqNo());
+ final Long primaryTerm = (Long) entity.remove(fessConfig.getIndexFieldPrimaryTerm());
+ if (seqNo != null && primaryTerm != null && oldId != null) {
+ fessEsClient.delete(index, oldId, seqNo, primaryTerm);
}
- }).orElse(() -> {
+ }
+
+ fessEsClient.store(index, entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ logger.error("Failed to update " + entity, e);
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), this::asEditHtml);
});
return redirectWith(getClass(), moreUrl("search").params("q", URLUtil.encode(form.q, Constants.UTF_8)));
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlog/AdminSearchlogAction.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlog/AdminSearchlogAction.java
index 66b538d16..b0ae3bc95 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/searchlog/AdminSearchlogAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlog/AdminSearchlogAction.java
@@ -36,8 +36,8 @@ public class AdminSearchlogAction extends FessAdminAction {
public static final String ROLE = "admin-searchlog";
- private static final String[] CONDITION_FIELDS = new String[] { "logType", "queryId", "userSessionId", "accessType",
- "requestedTimeRange", "pageSize" };
+ private static final String[] CONDITION_FIELDS =
+ new String[] { "logType", "queryId", "userSessionId", "accessType", "requestedTimeRange", "pageSize" };
// ===================================================================================
// Attribute
@@ -190,7 +190,7 @@ public class AdminSearchlogAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminSearchlog_AdminSearchlogJsp).renderWith(data -> {
RenderDataUtil.register(data, "searchLogItems", searchLogService.getSearchLogList(searchLogPager)); // page navi
- }).useForm(SearchForm.class, setup -> {
+ }).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(searchLogPager, form, op -> op.include(CONDITION_FIELDS));
});
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/storage/AdminStorageAction.java b/src/main/java/org/codelibs/fess/app/web/admin/storage/AdminStorageAction.java
index 24cb8a030..b5e5a5281 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/storage/AdminStorageAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/storage/AdminStorageAction.java
@@ -121,18 +121,17 @@ public class AdminStorageAction extends FessAdminAction {
if (StringUtil.isEmpty(values[1])) {
throwValidationError(messages -> messages.addErrorsStorageFileNotFound(GLOBAL), () -> asListHtml(encodeId(values[0])));
}
- return asStream(values[1]).contentTypeOctetStream().stream(
- out -> {
- try {
- downloadObject(getObjectName(values[0], values[1]), out);
- } catch (final StorageException e) {
- if (logger.isDebugEnabled()) {
- logger.debug("Failed to download {}", values[1], e);
- }
- throwValidationError(messages -> messages.addErrorsStorageFileDownloadFailure(GLOBAL, values[1]),
- () -> asListHtml(encodeId(values[0])));
- }
- });
+ return asStream(values[1]).contentTypeOctetStream().stream(out -> {
+ try {
+ downloadObject(getObjectName(values[0], values[1]), out);
+ } catch (final StorageException e) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Failed to download {}", values[1], e);
+ }
+ throwValidationError(messages -> messages.addErrorsStorageFileDownloadFailure(GLOBAL, values[1]),
+ () -> asListHtml(encodeId(values[0])));
+ }
+ });
}
@Execute
@@ -147,7 +146,8 @@ public class AdminStorageAction extends FessAdminAction {
deleteObject(objectName);
} catch (final StorageException e) {
logger.debug("Failed to delete {}", values[1], e);
- throwValidationError(messages -> messages.addErrorsFailedToDeleteFile(GLOBAL, values[1]), () -> asListHtml(encodeId(values[0])));
+ throwValidationError(messages -> messages.addErrorsFailedToDeleteFile(GLOBAL, values[1]),
+ () -> asListHtml(encodeId(values[0])));
}
saveInfo(messages -> messages.addSuccessDeleteFile(GLOBAL, values[1]));
return redirectWith(getClass(), moreUrl("list/" + encodeId(values[0])));
@@ -168,10 +168,9 @@ public class AdminStorageAction extends FessAdminAction {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
final MinioClient minioClient = createClient(fessConfig);
final PutObjectOptions options = new PutObjectOptions(uploadFile.getFileSize(), -1);
- final PutObjectArgs args =
- PutObjectArgs.builder().bucket(fessConfig.getStorageBucket()).object(objectName)
- .stream(in, options.objectSize(), options.partSize()).contentType(options.contentType())
- .headers(options.headers()).sse(options.sse()).build();
+ final PutObjectArgs args = PutObjectArgs.builder().bucket(fessConfig.getStorageBucket()).object(objectName)
+ .stream(in, options.objectSize(), options.partSize()).contentType(options.contentType()).headers(options.headers())
+ .sse(options.sse()).build();
minioClient.putObject(args);
} catch (final Exception e) {
throw new StorageException("Failed to upload " + objectName, e);
@@ -213,10 +212,9 @@ public class AdminStorageAction extends FessAdminAction {
final ArrayList<Map<String, Object>> list = new ArrayList<>();
try {
final MinioClient minioClient = createClient(fessConfig);
- final ListObjectsArgs args =
- ListObjectsArgs.builder().bucket(fessConfig.getStorageBucket())
- .prefix(prefix != null && prefix.length() > 0 ? prefix + "/" : prefix).recursive(false)
- .includeUserMetadata(false).useApiVersion1(false).build();
+ final ListObjectsArgs args = ListObjectsArgs.builder().bucket(fessConfig.getStorageBucket())
+ .prefix(prefix != null && prefix.length() > 0 ? prefix + "/" : prefix).recursive(false).includeUserMetadata(false)
+ .useApiVersion1(false).build();
for (final Result<Item> result : minioClient.listObjects(args)) {
final Map<String, Object> map = new HashMap<>();
final Item item = result.get();
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/systeminfo/AdminSysteminfoAction.java b/src/main/java/org/codelibs/fess/app/web/admin/systeminfo/AdminSysteminfoAction.java
index 4f9780ee9..13ab88279 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/systeminfo/AdminSysteminfoAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/systeminfo/AdminSysteminfoAction.java
@@ -51,9 +51,9 @@ public class AdminSysteminfoAction extends FessAdminAction {
@Resource
protected DynamicProperties systemProperties;
- private static final String[] bugReportLabels = { "file.separator", "file.encoding", "java.runtime.version", "java.vm.info",
- "java.vm.name", "java.vm.vendor", "java.vm.version", "os.arch", "os.name", "os.version", "user.country", "user.language",
- "user.timezone" };
+ private static final String[] bugReportLabels =
+ { "file.separator", "file.encoding", "java.runtime.version", "java.vm.info", "java.vm.name", "java.vm.vendor",
+ "java.vm.version", "os.arch", "os.name", "os.version", "user.country", "user.language", "user.timezone" };
// ===================================================================================
// Hook
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
index 845969bb4..1cb95288a 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
@@ -470,9 +470,9 @@ public class AdminUpgradeAction extends FessAdminAction {
private void upgradeFrom12_1() {
final IndicesAdminClient indicesClient = fessEsClient.admin().indices();
- UpgradeUtil.putMapping(indicesClient, "fess_log.search_log", "search_log", "{\"dynamic_templates\": ["
- + "{\"documents\": {\"path_match\": \"documents.*\",\"mapping\": {\"type\": \"keyword\"}}}"//
- + "]}");
+ UpgradeUtil.putMapping(indicesClient, "fess_log.search_log", "search_log",
+ "{\"dynamic_templates\": [" + "{\"documents\": {\"path_match\": \"documents.*\",\"mapping\": {\"type\": \"keyword\"}}}"//
+ + "]}");
UpgradeUtil.addFieldMapping(indicesClient, "fess_log.click_log", "click_log", "urlId",
"{\"properties\":{\"urlId\":{\"type\":\"keyword\"}}}");
}
@@ -504,12 +504,8 @@ public class AdminUpgradeAction extends FessAdminAction {
}
private void upgradeFrom13_0() {
- UpgradeUtil
- .addData(
- fessEsClient,
- ".fess_config.scheduled_job",
- "label_updater",
- "{\"name\":\"Label Updater\",\"target\":\"all\",\"cronExpression\":\"\",\"scriptType\":\"groovy\",\"scriptData\":\"return container.getComponent(\\\"updateLabelJob\\\").execute();\",\"jobLogging\":false,\"crawler\":false,\"available\":true,\"sortOrder\":11,\"createdBy\":\"system\",\"createdTime\":0,\"updatedBy\":\"system\",\"updatedTime\":0}");
+ UpgradeUtil.addData(fessEsClient, ".fess_config.scheduled_job", "label_updater",
+ "{\"name\":\"Label Updater\",\"target\":\"all\",\"cronExpression\":\"\",\"scriptType\":\"groovy\",\"scriptData\":\"return container.getComponent(\\\"updateLabelJob\\\").execute();\",\"jobLogging\":false,\"crawler\":false,\"available\":true,\"sortOrder\":11,\"createdBy\":\"system\",\"createdTime\":0,\"updatedBy\":\"system\",\"updatedTime\":0}");
}
private void upgradeFrom13_1() {
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java
index 460f4f06e..871e21d95 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java
@@ -214,17 +214,16 @@ public class AdminUserAction extends FessAdminAction {
validateAttributes(form.attributes, v -> throwValidationError(v, this::asEditHtml));
verifyPassword(form, this::asEditHtml);
verifyToken(this::asEditHtml);
- getUser(form).ifPresent(
- entity -> {
- try {
- userService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- logger.error("Failed to add " + entity, e);
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getUser(form).ifPresent(entity -> {
+ try {
+ userService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ logger.error("Failed to add " + entity, e);
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirect(getClass());
@@ -238,17 +237,16 @@ public class AdminUserAction extends FessAdminAction {
validateAttributes(form.attributes, v -> throwValidationError(v, this::asEditHtml));
verifyPassword(form, this::asEditHtml);
verifyToken(this::asEditHtml);
- getUser(form).ifPresent(
- entity -> {
- try {
- userService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- logger.error("Failed to update " + entity, e);
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getUser(form).ifPresent(entity -> {
+ try {
+ userService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ logger.error("Failed to update " + entity, e);
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), this::asEditHtml);
});
return redirect(getClass());
@@ -266,22 +264,18 @@ public class AdminUserAction extends FessAdminAction {
});
verifyToken(this::asDetailsHtml);
final String id = form.id;
- userService
- .getUser(id)
- .ifPresent(
- entity -> {
- try {
- userService.delete(entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- } catch (final Exception e) {
- logger.error("Failed to delete " + entity, e);
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asDetailsHtml);
- }
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
- });
+ userService.getUser(id).ifPresent(entity -> {
+ try {
+ userService.delete(entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ logger.error("Failed to delete " + entity, e);
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asDetailsHtml);
+ }
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
+ });
return redirect(getClass());
}
@@ -370,7 +364,7 @@ public class AdminUserAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminUser_AdminUserJsp).renderWith(data -> {
RenderDataUtil.register(data, "userItems", userService.getUserList(userPager)); // page navi
- }).useForm(SearchForm.class, setup -> {
+ }).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(userPager, form, op -> op.include("id"));
});
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java b/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java
index 4181587be..c76c17c2b 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java
@@ -197,16 +197,15 @@ public class AdminWebauthAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getWebAuthentication(form).ifPresent(
- entity -> {
- try {
- webAuthenticationService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getWebAuthentication(form).ifPresent(entity -> {
+ try {
+ webAuthenticationService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirect(getClass());
@@ -218,16 +217,15 @@ public class AdminWebauthAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getWebAuthentication(form).ifPresent(
- entity -> {
- try {
- webAuthenticationService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getWebAuthentication(form).ifPresent(entity -> {
+ try {
+ webAuthenticationService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), this::asEditHtml);
});
return redirect(getClass());
@@ -240,21 +238,17 @@ public class AdminWebauthAction extends FessAdminAction {
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
final String id = form.id;
- webAuthenticationService
- .getWebAuthentication(id)
- .ifPresent(
- entity -> {
- try {
- webAuthenticationService.delete(entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
- });
+ webAuthenticationService.getWebAuthentication(id).ifPresent(entity -> {
+ try {
+ webAuthenticationService.delete(entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
+ });
return redirect(getClass());
}
@@ -336,9 +330,9 @@ public class AdminWebauthAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminWebauth_AdminWebauthJsp).renderWith(data -> {
RenderDataUtil.register(data, "webAuthenticationItems", webAuthenticationService.getWebAuthenticationList(webAuthPager)); // page navi
- RenderDataUtil.register(data, "displayCreateLink", !crawlingConfigHelper.getAllWebConfigList(false, false, false, null)
- .isEmpty());
- }).useForm(SearchForm.class, setup -> {
+ RenderDataUtil.register(data, "displayCreateLink",
+ !crawlingConfigHelper.getAllWebConfigList(false, false, false, null).isEmpty());
+ }).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(webAuthPager, form, op -> op.include("id"));
});
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 3b7b97038..5054770a4 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
@@ -152,26 +152,19 @@ public class AdminWebconfigAction extends FessAdminAction {
public HtmlResponse edit(final EditForm form) {
validate(form, messages -> {}, this::asListHtml);
final String id = form.id;
- webConfigService
- .getWebConfig(id)
- .ifPresent(
- entity -> {
- copyBeanToBean(entity, form, copyOp -> {
- copyOp.excludeNull();
- copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
- });
- final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- form.permissions =
- stream(entity.getPermissions()).get(
- stream -> stream.map(s -> permissionHelper.decode(s)).filter(StringUtil::isNotBlank).distinct()
- .collect(Collectors.joining("\n")));
- form.virtualHosts =
- stream(entity.getVirtualHosts()).get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim)
- .collect(Collectors.joining("\n")));
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asListHtml);
- });
+ webConfigService.getWebConfig(id).ifPresent(entity -> {
+ copyBeanToBean(entity, form, copyOp -> {
+ copyOp.excludeNull();
+ copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
+ });
+ final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
+ form.permissions = stream(entity.getPermissions()).get(stream -> stream.map(s -> permissionHelper.decode(s))
+ .filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
+ form.virtualHosts = stream(entity.getVirtualHosts())
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).collect(Collectors.joining("\n")));
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asListHtml);
+ });
saveToken();
if (form.crudMode.intValue() == CrudMode.EDIT) {
// back
@@ -191,36 +184,24 @@ public class AdminWebconfigAction extends FessAdminAction {
public HtmlResponse details(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.DETAILS);
saveToken();
- return asDetailsHtml().useForm(
- EditForm.class,
- op -> {
- op.setup(form -> {
- webConfigService
- .getWebConfig(id)
- .ifPresent(
- entity -> {
- copyBeanToBean(entity, form, copyOp -> {
- copyOp.excludeNull();
- copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
- });
- final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- form.permissions =
- stream(entity.getPermissions()).get(
- stream -> stream.map(s -> permissionHelper.decode(s))
- .filter(StringUtil::isNotBlank).distinct()
- .collect(Collectors.joining("\n")));
- form.virtualHosts =
- stream(entity.getVirtualHosts()).get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim)
- .collect(Collectors.joining("\n")));
- form.crudMode = crudMode;
- })
- .orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id),
- this::asListHtml);
- });
+ return asDetailsHtml().useForm(EditForm.class, op -> {
+ op.setup(form -> {
+ webConfigService.getWebConfig(id).ifPresent(entity -> {
+ copyBeanToBean(entity, form, copyOp -> {
+ copyOp.excludeNull();
+ copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
});
+ final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
+ form.permissions = stream(entity.getPermissions()).get(stream -> stream.map(s -> permissionHelper.decode(s))
+ .filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
+ form.virtualHosts = stream(entity.getVirtualHosts())
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).collect(Collectors.joining("\n")));
+ form.crudMode = crudMode;
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asListHtml);
});
+ });
+ });
}
// -----------------------------------------------------
@@ -232,16 +213,15 @@ public class AdminWebconfigAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getWebConfig(form).ifPresent(
- entity -> {
- try {
- webConfigService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getWebConfig(form).ifPresent(entity -> {
+ try {
+ webConfigService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), this::asEditHtml);
});
return redirect(getClass());
@@ -253,16 +233,15 @@ public class AdminWebconfigAction extends FessAdminAction {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, this::asEditHtml);
verifyToken(this::asEditHtml);
- getWebConfig(form).ifPresent(
- entity -> {
- try {
- webConfigService.store(entity);
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
+ getWebConfig(form).ifPresent(entity -> {
+ try {
+ webConfigService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), this::asEditHtml);
});
return redirect(getClass());
@@ -275,21 +254,17 @@ public class AdminWebconfigAction extends FessAdminAction {
validate(form, messages -> {}, this::asDetailsHtml);
verifyToken(this::asDetailsHtml);
final String id = form.id;
- webConfigService
- .getWebConfig(id)
- .ifPresent(
- entity -> {
- try {
- webConfigService.delete(entity);
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
- } catch (final Exception e) {
- throwValidationError(
- messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
- this::asEditHtml);
- }
- }).orElse(() -> {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
- });
+ webConfigService.getWebConfig(id).ifPresent(entity -> {
+ try {
+ webConfigService.delete(entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ } catch (final Exception e) {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)),
+ this::asEditHtml);
+ }
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml);
+ });
return redirect(getClass());
}
@@ -319,23 +294,20 @@ public class AdminWebconfigAction extends FessAdminAction {
final SystemHelper systemHelper = ComponentUtil.getSystemHelper();
final String username = systemHelper.getUsername();
final long currentTime = systemHelper.getCurrentTimeAsLong();
- return getEntity(form, username, currentTime).map(
- entity -> {
- entity.setUpdatedBy(username);
- entity.setUpdatedTime(currentTime);
- copyBeanToBean(
- form,
- entity,
- op -> op.exclude(Stream.concat(Stream.of(Constants.COMMON_CONVERSION_RULE),
- Stream.of(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS)).toArray(n -> new String[n])));
- final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- entity.setPermissions(split(form.permissions, "\n").get(
- stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).distinct()
- .toArray(n -> new String[n])));
- entity.setVirtualHosts(split(form.virtualHosts, "\n").get(
- stream -> stream.filter(StringUtil::isNotBlank).distinct().map(String::trim).toArray(n -> new String[n])));
- return entity;
- });
+ return getEntity(form, username, currentTime).map(entity -> {
+ entity.setUpdatedBy(username);
+ entity.setUpdatedTime(currentTime);
+ copyBeanToBean(form, entity,
+ op -> op.exclude(Stream
+ .concat(Stream.of(Constants.COMMON_CONVERSION_RULE), Stream.of(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS))
+ .toArray(n -> new String[n])));
+ final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
+ entity.setPermissions(split(form.permissions, "\n").get(stream -> stream.map(s -> permissionHelper.encode(s))
+ .filter(StringUtil::isNotBlank).distinct().toArray(n -> new String[n])));
+ entity.setVirtualHosts(split(form.virtualHosts, "\n")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).distinct().map(String::trim).toArray(n -> new String[n])));
+ return entity;
+ });
}
protected void registerRolesAndLabels(final RenderData data) {
@@ -362,7 +334,7 @@ public class AdminWebconfigAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminWebconfig_AdminWebconfigJsp).renderWith(data -> {
RenderDataUtil.register(data, "webConfigItems", webConfigService.getWebConfigList(webConfigPager)); // page navi
- }).useForm(SearchForm.class, setup -> {
+ }).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(webConfigPager, form, op -> op.include("id", "name", "urls", "description"));
});
diff --git a/src/main/java/org/codelibs/fess/app/web/api/ApiResult.java b/src/main/java/org/codelibs/fess/app/web/api/ApiResult.java
index f3c5e938d..b05f4af2d 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/ApiResult.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/ApiResult.java
@@ -40,6 +40,7 @@ public class ApiResult {
public enum Status {
OK(0), BAD_REQUEST(1), SYSTEM_ERROR(2), UNAUTHORIZED(3);
+
private final int id;
private Status(final int id) {
@@ -342,11 +343,9 @@ public class ApiResult {
public ApiErrorResponse message(final VaMessenger<FessMessages> validationMessagesLambda) {
final FessMessages messages = new FessMessages();
validationMessagesLambda.message(messages);
- message =
- ComponentUtil
- .getMessageManager()
- .toMessageList(LaRequestUtil.getOptionalRequest().map(HttpServletRequest::getLocale).orElse(Locale.ENGLISH),
- messages).stream().collect(Collectors.joining(" "));
+ message = ComponentUtil.getMessageManager()
+ .toMessageList(LaRequestUtil.getOptionalRequest().map(HttpServletRequest::getLocale).orElse(Locale.ENGLISH), messages)
+ .stream().collect(Collectors.joining(" "));
return this;
}
}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/ApiAdminAccesstokenAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/ApiAdminAccesstokenAction.java
index d62d8574e..b21fda28f 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/ApiAdminAccesstokenAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/ApiAdminAccesstokenAction.java
@@ -132,10 +132,8 @@ public class ApiAdminAccesstokenAction extends FessApiAdminAction {
copyBeanToBean(entity, body, copyOp -> copyOp.exclude(Constants.PERMISSIONS, AdminAccesstokenAction.EXPIRED_TIME).excludeNull()
.dateConverter(Constants.DEFAULT_DATETIME_FORMAT, AdminAccesstokenAction.EXPIRES));
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- body.permissions =
- stream(entity.getPermissions()).get(
- stream -> stream.map(permissionHelper::decode).filter(StringUtil::isNotBlank).distinct()
- .collect(Collectors.joining("\n")));
+ body.permissions = stream(entity.getPermissions()).get(
+ stream -> stream.map(permissionHelper::decode).filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
body.crudMode = null;
return body;
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/backup/ApiAdminBackupAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/backup/ApiAdminBackupAction.java
index 8f14530ac..aefe5d788 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/backup/ApiAdminBackupAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/backup/ApiAdminBackupAction.java
@@ -91,13 +91,12 @@ public class ApiAdminBackupAction extends FessApiAdminAction {
index = id;
filename = id + ".bulk";
}
- return asStream(filename).contentTypeOctetStream().stream(
- out -> {
- try (CurlResponse response =
- ComponentUtil.getCurlHelper().get("/" + index + "/_data").param("format", "json").execute()) {
- out.write(response.getContentAsStream());
- }
- });
+ return asStream(filename).contentTypeOctetStream().stream(out -> {
+ try (CurlResponse response =
+ ComponentUtil.getCurlHelper().get("/" + index + "/_data").param("format", "json").execute()) {
+ out.write(response.getContentAsStream());
+ }
+ });
}
}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/badword/ApiAdminBadwordAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/badword/ApiAdminBadwordAction.java
index e54120cd6..b4f10c7ec 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/badword/ApiAdminBadwordAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/badword/ApiAdminBadwordAction.java
@@ -63,9 +63,9 @@ public class ApiAdminBadwordAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final BadWordPager pager = copyBeanToNewBean(body, BadWordPager.class);
final List<BadWord> list = badWordService.getBadWordList(pager);
- return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(list.stream().map(this::createEditBody).collect(Collectors.toList())).total(pager.getAllRecordCount())
- .status(ApiResult.Status.OK).result());
+ return asJson(
+ new ApiResult.ApiConfigsResponse<EditBody>().settings(list.stream().map(this::createEditBody).collect(Collectors.toList()))
+ .total(pager.getAllRecordCount()).status(ApiResult.Status.OK).result());
}
// GET /api/admin/badword/{id}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/ApiAdminDataconfigAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/ApiAdminDataconfigAction.java
index 1c947824c..fe3765fd4 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/ApiAdminDataconfigAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/ApiAdminDataconfigAction.java
@@ -62,9 +62,9 @@ public class ApiAdminDataconfigAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final DataConfigPager pager = copyBeanToNewBean(body, DataConfigPager.class);
final List<DataConfig> list = dataConfigService.getDataConfigList(pager);
- return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(list.stream().map(this::createEditBody).collect(Collectors.toList())).total(pager.getAllRecordCount())
- .status(ApiResult.Status.OK).result());
+ return asJson(
+ new ApiResult.ApiConfigsResponse<EditBody>().settings(list.stream().map(this::createEditBody).collect(Collectors.toList()))
+ .total(pager.getAllRecordCount()).status(ApiResult.Status.OK).result());
}
// GET /api/admin/dataconfig/setting/{id}
@@ -138,13 +138,10 @@ public class ApiAdminDataconfigAction extends FessApiAdminAction {
copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
});
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- body.permissions =
- stream(entity.getPermissions()).get(
- stream -> stream.map(s -> permissionHelper.decode(s)).filter(StringUtil::isNotBlank).distinct()
- .collect(Collectors.joining("\n")));
- body.virtualHosts =
- stream(entity.getVirtualHosts()).get(
- stream -> stream.filter(StringUtil::isNotBlank).distinct().map(String::trim).collect(Collectors.joining("\n")));
+ body.permissions = stream(entity.getPermissions()).get(stream -> stream.map(s -> permissionHelper.decode(s))
+ .filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
+ body.virtualHosts = stream(entity.getVirtualHosts())
+ .get(stream -> stream.filter(StringUtil::isNotBlank).distinct().map(String::trim).collect(Collectors.joining("\n")));
return body;
}
}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/ApiAdminDictAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/ApiAdminDictAction.java
index f1400a7a6..5810128bf 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/ApiAdminDictAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/ApiAdminDictAction.java
@@ -37,7 +37,8 @@ public class ApiAdminDictAction extends FessApiAdminAction {
public JsonResponse<ApiResult> get$index() {
final DictionaryFile<? extends DictionaryItem>[] dictFiles = dictionaryManager.getDictionaryFiles();
return asJson(new ApiResult.ApiConfigsResponse<ListBody>()
- .settings(Stream.of(dictFiles).map(this::createListBody).collect(Collectors.toList())).status(ApiResult.Status.OK).result());
+ .settings(Stream.of(dictFiles).map(this::createListBody).collect(Collectors.toList())).status(ApiResult.Status.OK)
+ .result());
}
protected ListBody createListBody(final DictionaryFile<? extends DictionaryItem> dictionaryFile) {
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/ApiAdminDictKuromojiAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/ApiAdminDictKuromojiAction.java
index 83faf2a89..7d5ea09df 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/ApiAdminDictKuromojiAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/ApiAdminDictKuromojiAction.java
@@ -48,9 +48,8 @@ public class ApiAdminDictKuromojiAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final KuromojiPager pager = copyBeanToNewBean(body, KuromojiPager.class);
return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(
- kuromojiService.getKuromojiList(body.dictId, pager).stream()
- .map(protwordsItem -> createEditBody(protwordsItem, dictId)).collect(Collectors.toList()))
+ .settings(kuromojiService.getKuromojiList(body.dictId, pager).stream()
+ .map(protwordsItem -> createEditBody(protwordsItem, dictId)).collect(Collectors.toList()))
.status(ApiResult.Status.OK).result());
}
@@ -78,8 +77,8 @@ public class ApiAdminDictKuromojiAction extends FessApiAdminAction {
return null;
});
kuromojiService.store(body.dictId, entity);
- return asJson(new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(true).status(ApiResult.Status.OK)
- .result());
+ return asJson(
+ new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(true).status(ApiResult.Status.OK).result());
}
// POST /api/admin/dict/kuromoji/setting/{dictId}
@@ -96,8 +95,8 @@ public class ApiAdminDictKuromojiAction extends FessApiAdminAction {
return null;
});
kuromojiService.store(body.dictId, entity);
- return asJson(new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(false).status(ApiResult.Status.OK)
- .result());
+ return asJson(
+ new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(false).status(ApiResult.Status.OK).result());
}
// DELETE /api/admin/dict/kuromoji/setting/{dictId}/{id}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/ApiAdminDictMappingAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/ApiAdminDictMappingAction.java
index 30606bed4..2c5bb2ec7 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/ApiAdminDictMappingAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/ApiAdminDictMappingAction.java
@@ -48,9 +48,8 @@ public class ApiAdminDictMappingAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final CharMappingPager pager = copyBeanToNewBean(body, CharMappingPager.class);
return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(
- charMappingService.getCharMappingList(body.dictId, pager).stream()
- .map(protwordsItem -> createEditBody(protwordsItem, dictId)).collect(Collectors.toList()))
+ .settings(charMappingService.getCharMappingList(body.dictId, pager).stream()
+ .map(protwordsItem -> createEditBody(protwordsItem, dictId)).collect(Collectors.toList()))
.status(ApiResult.Status.OK).result());
}
@@ -78,8 +77,8 @@ public class ApiAdminDictMappingAction extends FessApiAdminAction {
return null;
});
charMappingService.store(body.dictId, entity);
- return asJson(new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(true).status(ApiResult.Status.OK)
- .result());
+ return asJson(
+ new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(true).status(ApiResult.Status.OK).result());
}
// POST /api/admin/dict/mapping/setting/{dictId}
@@ -96,8 +95,8 @@ public class ApiAdminDictMappingAction extends FessApiAdminAction {
return null;
});
charMappingService.store(body.dictId, entity);
- return asJson(new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(false).status(ApiResult.Status.OK)
- .result());
+ return asJson(
+ new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(false).status(ApiResult.Status.OK).result());
}
// DELETE /api/admin/dict/mapping/setting/{dictId}/{id}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/ApiAdminDictProtwordsAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/ApiAdminDictProtwordsAction.java
index 47394ba43..e32459a88 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/ApiAdminDictProtwordsAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/ApiAdminDictProtwordsAction.java
@@ -47,9 +47,8 @@ public class ApiAdminDictProtwordsAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final ProtwordsPager pager = copyBeanToNewBean(body, ProtwordsPager.class);
return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(
- protwordsService.getProtwordsList(body.dictId, pager).stream()
- .map(protwordsItem -> createEditBody(protwordsItem, dictId)).collect(Collectors.toList()))
+ .settings(protwordsService.getProtwordsList(body.dictId, pager).stream()
+ .map(protwordsItem -> createEditBody(protwordsItem, dictId)).collect(Collectors.toList()))
.status(ApiResult.Status.OK).result());
}
@@ -77,8 +76,8 @@ public class ApiAdminDictProtwordsAction extends FessApiAdminAction {
return null;
});
protwordsService.store(body.dictId, entity);
- return asJson(new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(true).status(ApiResult.Status.OK)
- .result());
+ return asJson(
+ new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(true).status(ApiResult.Status.OK).result());
}
// POST /api/admin/dict/protwords/setting/{dictId}
@@ -95,8 +94,8 @@ public class ApiAdminDictProtwordsAction extends FessApiAdminAction {
return null;
});
protwordsService.store(body.dictId, entity);
- return asJson(new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(false).status(ApiResult.Status.OK)
- .result());
+ return asJson(
+ new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(false).status(ApiResult.Status.OK).result());
}
// DELETE /api/admin/dict/protwords/setting/{dictId}/{id}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stemmeroverride/ApiAdminDictStemmeroverrideAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stemmeroverride/ApiAdminDictStemmeroverrideAction.java
index dab2266f4..3d2abf810 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stemmeroverride/ApiAdminDictStemmeroverrideAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stemmeroverride/ApiAdminDictStemmeroverrideAction.java
@@ -48,26 +48,19 @@ public class ApiAdminDictStemmeroverrideAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final StemmerOverridePager pager = copyBeanToNewBean(body, StemmerOverridePager.class);
return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(
- stemmerOverrideService.getStemmerOverrideList(body.dictId, pager).stream()
- .map(protwordsItem -> createEditBody(protwordsItem, dictId)).collect(Collectors.toList()))
+ .settings(stemmerOverrideService.getStemmerOverrideList(body.dictId, pager).stream()
+ .map(protwordsItem -> createEditBody(protwordsItem, dictId)).collect(Collectors.toList()))
.status(ApiResult.Status.OK).result());
}
// GET /api/admin/dict/stemmerOverride/setting/{dictId}/{id}
@Execute
public JsonResponse<ApiResult> get$setting(final String dictId, final long id) {
- return asJson(new ApiResult.ApiConfigResponse()
- .setting(
- stemmerOverrideService
- .getStemmerOverrideItem(dictId, id)
- .map(entity -> createEditBody(entity, dictId))
- .orElseGet(
- () -> {
- throwValidationErrorApi(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL,
- String.valueOf(id)));
- return null;
- })).status(ApiResult.Status.OK).result());
+ return asJson(new ApiResult.ApiConfigResponse().setting(
+ stemmerOverrideService.getStemmerOverrideItem(dictId, id).map(entity -> createEditBody(entity, dictId)).orElseGet(() -> {
+ throwValidationErrorApi(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, String.valueOf(id)));
+ return null;
+ })).status(ApiResult.Status.OK).result());
}
// PUT /api/admin/dict/stemmerOverride/setting/{dictId}
@@ -84,8 +77,8 @@ public class ApiAdminDictStemmeroverrideAction extends FessApiAdminAction {
return null;
});
stemmerOverrideService.store(body.dictId, entity);
- return asJson(new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(true).status(ApiResult.Status.OK)
- .result());
+ return asJson(
+ new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(true).status(ApiResult.Status.OK).result());
}
// POST /api/admin/dict/stemmerOverride/setting/{dictId}
@@ -102,8 +95,8 @@ public class ApiAdminDictStemmeroverrideAction extends FessApiAdminAction {
return null;
});
stemmerOverrideService.store(body.dictId, entity);
- return asJson(new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(false).status(ApiResult.Status.OK)
- .result());
+ return asJson(
+ new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(false).status(ApiResult.Status.OK).result());
}
// DELETE /api/admin/dict/stemmerOverride/setting/{dictId}/{id}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stopwords/ApiAdminDictStopwordsAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stopwords/ApiAdminDictStopwordsAction.java
index 2300c8838..185de937b 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stopwords/ApiAdminDictStopwordsAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stopwords/ApiAdminDictStopwordsAction.java
@@ -47,9 +47,8 @@ public class ApiAdminDictStopwordsAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final StopwordsPager pager = copyBeanToNewBean(body, StopwordsPager.class);
return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(
- stopwordsService.getStopwordsList(body.dictId, pager).stream()
- .map(stopwordsItem -> createEditBody(stopwordsItem, dictId)).collect(Collectors.toList()))
+ .settings(stopwordsService.getStopwordsList(body.dictId, pager).stream()
+ .map(stopwordsItem -> createEditBody(stopwordsItem, dictId)).collect(Collectors.toList()))
.status(ApiResult.Status.OK).result());
}
@@ -77,8 +76,8 @@ public class ApiAdminDictStopwordsAction extends FessApiAdminAction {
return null;
});
stopwordsService.store(body.dictId, entity);
- return asJson(new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(true).status(ApiResult.Status.OK)
- .result());
+ return asJson(
+ new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(true).status(ApiResult.Status.OK).result());
}
// POST /api/admin/dict/stopwords/setting/{dictId}
@@ -95,8 +94,8 @@ public class ApiAdminDictStopwordsAction extends FessApiAdminAction {
return null;
});
stopwordsService.store(body.dictId, entity);
- return asJson(new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(false).status(ApiResult.Status.OK)
- .result());
+ return asJson(
+ new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(false).status(ApiResult.Status.OK).result());
}
// DELETE /api/admin/dict/stopwords/setting/{dictId}/{id}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/ApiAdminDictSynonymAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/ApiAdminDictSynonymAction.java
index 505904ac3..bf0809872 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/ApiAdminDictSynonymAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/ApiAdminDictSynonymAction.java
@@ -48,9 +48,8 @@ public class ApiAdminDictSynonymAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final SynonymPager pager = copyBeanToNewBean(body, SynonymPager.class);
return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(
- synonymService.getSynonymList(body.dictId, pager).stream()
- .map(protwordsItem -> createEditBody(protwordsItem, dictId)).collect(Collectors.toList()))
+ .settings(synonymService.getSynonymList(body.dictId, pager).stream()
+ .map(protwordsItem -> createEditBody(protwordsItem, dictId)).collect(Collectors.toList()))
.status(ApiResult.Status.OK).result());
}
@@ -78,8 +77,8 @@ public class ApiAdminDictSynonymAction extends FessApiAdminAction {
return null;
});
synonymService.store(body.dictId, entity);
- return asJson(new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(true).status(ApiResult.Status.OK)
- .result());
+ return asJson(
+ new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(true).status(ApiResult.Status.OK).result());
}
// POST /api/admin/dict/synonym/setting/{dictId}
@@ -96,8 +95,8 @@ public class ApiAdminDictSynonymAction extends FessApiAdminAction {
return null;
});
synonymService.store(body.dictId, entity);
- return asJson(new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(false).status(ApiResult.Status.OK)
- .result());
+ return asJson(
+ new ApiResult.ApiUpdateResponse().id(String.valueOf(entity.getId())).created(false).status(ApiResult.Status.OK).result());
}
// DELETE /api/admin/dict/synonym/setting/{dictId}/{id}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/ApiAdminDuplicatehostAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/ApiAdminDuplicatehostAction.java
index 858b7365c..d64c3b260 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/ApiAdminDuplicatehostAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/ApiAdminDuplicatehostAction.java
@@ -57,9 +57,9 @@ public class ApiAdminDuplicatehostAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final DuplicateHostPager pager = copyBeanToNewBean(body, DuplicateHostPager.class);
final List<DuplicateHost> list = duplicateHostService.getDuplicateHostList(pager);
- return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(list.stream().map(this::createEditBody).collect(Collectors.toList())).total(pager.getAllRecordCount())
- .status(ApiResult.Status.OK).result());
+ return asJson(
+ new ApiResult.ApiConfigsResponse<EditBody>().settings(list.stream().map(this::createEditBody).collect(Collectors.toList()))
+ .total(pager.getAllRecordCount()).status(ApiResult.Status.OK).result());
}
// GET /api/admin/duplicatehost/setting/{id}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/ApiAdminElevatewordAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/ApiAdminElevatewordAction.java
index 400ce6c97..7279700fb 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/ApiAdminElevatewordAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/ApiAdminElevatewordAction.java
@@ -67,9 +67,9 @@ public class ApiAdminElevatewordAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final ElevateWordPager pager = copyBeanToNewBean(body, ElevateWordPager.class);
final List<ElevateWord> list = elevateWordService.getElevateWordList(pager);
- return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(list.stream().map(this::createEditBody).collect(Collectors.toList())).total(pager.getAllRecordCount())
- .status(ApiResult.Status.OK).result());
+ return asJson(
+ new ApiResult.ApiConfigsResponse<EditBody>().settings(list.stream().map(this::createEditBody).collect(Collectors.toList()))
+ .total(pager.getAllRecordCount()).status(ApiResult.Status.OK).result());
}
// GET /api/admin/elevateword/{id}
@@ -83,10 +83,8 @@ public class ApiAdminElevatewordAction extends FessApiAdminAction {
final EditBody body = createEditBody(entity);
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- body.permissions =
- stream(entity.getPermissions()).get(
- stream -> stream.map(s -> permissionHelper.decode(s)).filter(StringUtil::isNotBlank).distinct()
- .collect(Collectors.joining("\n")));
+ body.permissions = stream(entity.getPermissions()).get(stream -> stream.map(s -> permissionHelper.decode(s))
+ .filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
return asJson(new ApiResult.ApiConfigResponse().setting(body).status(ApiResult.Status.OK).result());
}
@@ -103,8 +101,8 @@ public class ApiAdminElevatewordAction extends FessApiAdminAction {
});
try {
elevateWordService.store(entity);
- suggestHelper.addElevateWord(entity.getSuggestWord(), entity.getReading(), entity.getLabelTypeValues(),
- entity.getPermissions(), entity.getBoost(), false);
+ suggestHelper.addElevateWord(entity.getSuggestWord(), entity.getReading(), entity.getLabelTypeValues(), entity.getPermissions(),
+ entity.getBoost(), false);
} catch (final Exception e) {
throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)));
}
@@ -197,10 +195,8 @@ public class ApiAdminElevatewordAction extends FessApiAdminAction {
copyOp.exclude(Constants.PERMISSIONS);
});
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- body.permissions =
- stream(entity.getPermissions()).get(
- stream -> stream.map(s -> permissionHelper.decode(s)).filter(StringUtil::isNotBlank).distinct()
- .collect(Collectors.joining("\n")));
+ body.permissions = stream(entity.getPermissions()).get(stream -> stream.map(s -> permissionHelper.decode(s))
+ .filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
return body;
}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/ApiAdminFileauthAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/ApiAdminFileauthAction.java
index 3a173a974..a45270366 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/ApiAdminFileauthAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/ApiAdminFileauthAction.java
@@ -61,9 +61,9 @@ public class ApiAdminFileauthAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final FileAuthPager pager = copyBeanToNewBean(body, FileAuthPager.class);
final List<FileAuthentication> list = fileAuthService.getFileAuthenticationList(pager);
- return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(list.stream().map(this::createEditBody).collect(Collectors.toList())).total(pager.getAllRecordCount())
- .status(ApiResult.Status.OK).result());
+ return asJson(
+ new ApiResult.ApiConfigsResponse<EditBody>().settings(list.stream().map(this::createEditBody).collect(Collectors.toList()))
+ .total(pager.getAllRecordCount()).status(ApiResult.Status.OK).result());
}
// GET /api/admin/fileauth/setting/{id}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/ApiAdminFileconfigAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/ApiAdminFileconfigAction.java
index 8101b8812..2f9ad6531 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/ApiAdminFileconfigAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/ApiAdminFileconfigAction.java
@@ -62,9 +62,9 @@ public class ApiAdminFileconfigAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final FileConfigPager pager = copyBeanToNewBean(body, FileConfigPager.class);
final List<FileConfig> list = fileConfigService.getFileConfigList(pager);
- return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(list.stream().map(this::createEditBody).collect(Collectors.toList())).total(pager.getAllRecordCount())
- .status(ApiResult.Status.OK).result());
+ return asJson(
+ new ApiResult.ApiConfigsResponse<EditBody>().settings(list.stream().map(this::createEditBody).collect(Collectors.toList()))
+ .total(pager.getAllRecordCount()).status(ApiResult.Status.OK).result());
}
// GET /api/admin/fileconfig/setting/{id}
@@ -138,13 +138,10 @@ public class ApiAdminFileconfigAction extends FessApiAdminAction {
copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
});
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- body.permissions =
- stream(entity.getPermissions()).get(
- stream -> stream.map(s -> permissionHelper.decode(s)).filter(StringUtil::isNotBlank).distinct()
- .collect(Collectors.joining("\n")));
- body.virtualHosts =
- stream(entity.getVirtualHosts()).get(
- stream -> stream.filter(StringUtil::isNotBlank).distinct().map(String::trim).collect(Collectors.joining("\n")));
+ body.permissions = stream(entity.getPermissions()).get(stream -> stream.map(s -> permissionHelper.decode(s))
+ .filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
+ body.virtualHosts = stream(entity.getVirtualHosts())
+ .get(stream -> stream.filter(StringUtil::isNotBlank).distinct().map(String::trim).collect(Collectors.joining("\n")));
return body;
}
}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/group/ApiAdminGroupAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/group/ApiAdminGroupAction.java
index e5b8d6892..0803d42e0 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/group/ApiAdminGroupAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/group/ApiAdminGroupAction.java
@@ -45,9 +45,9 @@ public class ApiAdminGroupAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final GroupPager pager = copyBeanToNewBean(body, GroupPager.class);
final List<Group> list = groupService.getGroupList(pager);
- return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(list.stream().map(this::createEditBody).collect(Collectors.toList())).total(pager.getAllRecordCount())
- .status(ApiResult.Status.OK).result());
+ return asJson(
+ new ApiResult.ApiConfigsResponse<EditBody>().settings(list.stream().map(this::createEditBody).collect(Collectors.toList()))
+ .total(pager.getAllRecordCount()).status(ApiResult.Status.OK).result());
}
// GET /api/admin/group/setting/{id}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/ApiAdminKeymatchAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/ApiAdminKeymatchAction.java
index 7b805ab63..009a1d52b 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/ApiAdminKeymatchAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/ApiAdminKeymatchAction.java
@@ -57,9 +57,9 @@ public class ApiAdminKeymatchAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final KeyMatchPager pager = copyBeanToNewBean(body, KeyMatchPager.class);
final List<KeyMatch> list = keyMatchService.getKeyMatchList(pager);
- return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(list.stream().map(this::createEditBody).collect(Collectors.toList())).total(pager.getAllRecordCount())
- .status(ApiResult.Status.OK).result());
+ return asJson(
+ new ApiResult.ApiConfigsResponse<EditBody>().settings(list.stream().map(this::createEditBody).collect(Collectors.toList()))
+ .total(pager.getAllRecordCount()).status(ApiResult.Status.OK).result());
}
// GET /api/admin/keymatch/setting/{id}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/ApiAdminLabeltypeAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/ApiAdminLabeltypeAction.java
index a3875d097..e34e9f268 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/ApiAdminLabeltypeAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/ApiAdminLabeltypeAction.java
@@ -62,9 +62,9 @@ public class ApiAdminLabeltypeAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final LabelTypePager pager = copyBeanToNewBean(body, LabelTypePager.class);
final List<LabelType> list = labelTypeService.getLabelTypeList(pager);
- return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(list.stream().map(this::createEditBody).collect(Collectors.toList())).total(pager.getAllRecordCount())
- .status(ApiResult.Status.OK).result());
+ return asJson(
+ new ApiResult.ApiConfigsResponse<EditBody>().settings(list.stream().map(this::createEditBody).collect(Collectors.toList()))
+ .total(pager.getAllRecordCount()).status(ApiResult.Status.OK).result());
}
// GET /api/admin/labeltype/setting/{id}
@@ -138,10 +138,8 @@ public class ApiAdminLabeltypeAction extends FessApiAdminAction {
copyOp.exclude(Constants.PERMISSIONS);
});
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- body.permissions =
- stream(entity.getPermissions()).get(
- stream -> stream.map(s -> permissionHelper.decode(s)).filter(StringUtil::isNotBlank).distinct()
- .collect(Collectors.joining("\n")));
+ body.permissions = stream(entity.getPermissions()).get(stream -> stream.map(s -> permissionHelper.decode(s))
+ .filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
return body;
}
}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/ApiAdminPathmapAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/ApiAdminPathmapAction.java
index 20b7d9349..a762b6187 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/ApiAdminPathmapAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/ApiAdminPathmapAction.java
@@ -44,16 +44,16 @@ public class ApiAdminPathmapAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final PathMapPager pager = copyBeanToNewBean(body, PathMapPager.class);
final List<PathMapping> list = pathMappingService.getPathMappingList(pager);
- return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(list.stream().map(this::createEditBody).collect(Collectors.toList())).total(pager.getAllRecordCount())
- .status(ApiResult.Status.OK).result());
+ return asJson(
+ new ApiResult.ApiConfigsResponse<EditBody>().settings(list.stream().map(this::createEditBody).collect(Collectors.toList()))
+ .total(pager.getAllRecordCount()).status(ApiResult.Status.OK).result());
}
// GET /api/admin/pathmap/setting/{id}
@Execute
public JsonResponse<ApiResult> get$setting(final String id) {
- return asJson(new ApiResult.ApiConfigResponse()
- .setting(pathMappingService.getPathMapping(id).map(this::createEditBody).orElseGet(() -> {
+ return asJson(
+ new ApiResult.ApiConfigResponse().setting(pathMappingService.getPathMapping(id).map(this::createEditBody).orElseGet(() -> {
throwValidationErrorApi(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id));
return null;
})).status(ApiResult.Status.OK).result());
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/plugin/ApiAdminPluginAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/plugin/ApiAdminPluginAction.java
index 30cee5aa6..86864bd84 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/plugin/ApiAdminPluginAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/plugin/ApiAdminPluginAction.java
@@ -52,7 +52,8 @@ public class ApiAdminPluginAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final Artifact artifact = ComponentUtil.getPluginHelper().getArtifact(body.name, body.version);
if (artifact == null) {
- return asJson(new ApiResult.ApiErrorResponse().message("invalid name or version").status(ApiResult.Status.BAD_REQUEST).result());
+ return asJson(
+ new ApiResult.ApiErrorResponse().message("invalid name or version").status(ApiResult.Status.BAD_REQUEST).result());
}
installArtifact(artifact);
return asJson(new ApiResult.ApiResponse().status(ApiResult.Status.OK).result());
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/ApiAdminRelatedcontentAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/ApiAdminRelatedcontentAction.java
index 05c94e32a..f06c14e4c 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/ApiAdminRelatedcontentAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/ApiAdminRelatedcontentAction.java
@@ -54,16 +54,16 @@ public class ApiAdminRelatedcontentAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final RelatedContentPager pager = copyBeanToNewBean(body, RelatedContentPager.class);
final List<RelatedContent> list = relatedContentService.getRelatedContentList(pager);
- return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(list.stream().map(this::createEditBody).collect(Collectors.toList())).total(pager.getAllRecordCount())
- .status(ApiResult.Status.OK).result());
+ return asJson(
+ new ApiResult.ApiConfigsResponse<EditBody>().settings(list.stream().map(this::createEditBody).collect(Collectors.toList()))
+ .total(pager.getAllRecordCount()).status(ApiResult.Status.OK).result());
}
// GET /api/admin/relatedcontent/setting/{id}
@Execute
public JsonResponse<ApiResult> get$setting(final String id) {
- return asJson(new ApiConfigResponse()
- .setting(relatedContentService.getRelatedContent(id).map(this::createEditBody).orElseGet(() -> {
+ return asJson(
+ new ApiConfigResponse().setting(relatedContentService.getRelatedContent(id).map(this::createEditBody).orElseGet(() -> {
throwValidationErrorApi(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id));
return null;
})).status(Status.OK).result());
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/ApiAdminRelatedqueryAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/ApiAdminRelatedqueryAction.java
index 5cb0d2450..20b37f1b3 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/ApiAdminRelatedqueryAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/ApiAdminRelatedqueryAction.java
@@ -57,9 +57,9 @@ public class ApiAdminRelatedqueryAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final RelatedQueryPager pager = copyBeanToNewBean(body, RelatedQueryPager.class);
final List<RelatedQuery> list = relatedQueryService.getRelatedQueryList(pager);
- return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(list.stream().map(this::createEditBody).collect(Collectors.toList())).total(pager.getAllRecordCount())
- .status(ApiResult.Status.OK).result());
+ return asJson(
+ new ApiResult.ApiConfigsResponse<EditBody>().settings(list.stream().map(this::createEditBody).collect(Collectors.toList()))
+ .total(pager.getAllRecordCount()).status(ApiResult.Status.OK).result());
}
// GET /api/admin/relatedquery/setting/{id}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/ApiAdminReqheaderAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/ApiAdminReqheaderAction.java
index d447b0e42..d676a5777 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/ApiAdminReqheaderAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/ApiAdminReqheaderAction.java
@@ -61,9 +61,9 @@ public class ApiAdminReqheaderAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final ReqHeaderPager pager = copyBeanToNewBean(body, ReqHeaderPager.class);
final List<RequestHeader> list = reqHeaderService.getRequestHeaderList(pager);
- return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(list.stream().map(this::createEditBody).collect(Collectors.toList())).total(pager.getAllRecordCount())
- .status(ApiResult.Status.OK).result());
+ return asJson(
+ new ApiResult.ApiConfigsResponse<EditBody>().settings(list.stream().map(this::createEditBody).collect(Collectors.toList()))
+ .total(pager.getAllRecordCount()).status(ApiResult.Status.OK).result());
}
// GET /api/admin/reqheader/setting/{id}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/role/ApiAdminRoleAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/role/ApiAdminRoleAction.java
index 8c5001bbc..16d083013 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/role/ApiAdminRoleAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/role/ApiAdminRoleAction.java
@@ -43,9 +43,9 @@ public class ApiAdminRoleAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final RolePager pager = copyBeanToNewBean(body, RolePager.class);
final List<Role> list = roleService.getRoleList(pager);
- return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(list.stream().map(this::createEditBody).collect(Collectors.toList())).total(pager.getAllRecordCount())
- .status(ApiResult.Status.OK).result());
+ return asJson(
+ new ApiResult.ApiConfigsResponse<EditBody>().settings(list.stream().map(this::createEditBody).collect(Collectors.toList()))
+ .total(pager.getAllRecordCount()).status(ApiResult.Status.OK).result());
}
// GET /api/admin/role/setting/{id}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/ApiAdminSchedulerAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/ApiAdminSchedulerAction.java
index 4494c2bc6..45a964533 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/ApiAdminSchedulerAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/ApiAdminSchedulerAction.java
@@ -95,9 +95,9 @@ public class ApiAdminSchedulerAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final SchedulerPager pager = copyBeanToNewBean(body, SchedulerPager.class);
final List<ScheduledJob> list = scheduledJobService.getScheduledJobList(pager);
- return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(list.stream().map(this::createEditBody).collect(Collectors.toList())).total(pager.getAllRecordCount())
- .status(ApiResult.Status.OK).result());
+ return asJson(
+ new ApiResult.ApiConfigsResponse<EditBody>().settings(list.stream().map(this::createEditBody).collect(Collectors.toList()))
+ .total(pager.getAllRecordCount()).status(ApiResult.Status.OK).result());
}
// GET /api/admin/scheduler/setting/{id}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java
index eb48f08a0..61e41a64e 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java
@@ -141,8 +141,8 @@ public class ApiAdminSearchlistAction extends FessApiAdminAction {
throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL));
return null;
});
- return asJson(new ApiUpdateResponse().id(doc.get(fessConfig.getIndexFieldDocId()).toString()).created(true).status(Status.OK)
- .result());
+ return asJson(
+ new ApiUpdateResponse().id(doc.get(fessConfig.getIndexFieldDocId()).toString()).created(true).status(Status.OK).result());
}
// POST /api/admin/searchlist/doc
@@ -182,8 +182,8 @@ public class ApiAdminSearchlistAction extends FessApiAdminAction {
throwValidationErrorApi(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, body.doc.toString()));
return null;
});
- return asJson(new ApiUpdateResponse().id(doc.get(fessConfig.getIndexFieldDocId()).toString()).created(false).status(Status.OK)
- .result());
+ return asJson(
+ new ApiUpdateResponse().id(doc.get(fessConfig.getIndexFieldDocId()).toString()).created(false).status(Status.OK).result());
}
// DELETE /api/admin/searchlist/doc/{doc_id}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/user/ApiAdminUserAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/user/ApiAdminUserAction.java
index 98de79456..6d2f812f4 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/user/ApiAdminUserAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/user/ApiAdminUserAction.java
@@ -44,9 +44,9 @@ public class ApiAdminUserAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final UserPager pager = copyBeanToNewBean(body, UserPager.class);
final List<User> list = userService.getUserList(pager);
- return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(list.stream().map(this::createEditBody).collect(Collectors.toList())).total(pager.getAllRecordCount())
- .status(ApiResult.Status.OK).result());
+ return asJson(
+ new ApiResult.ApiConfigsResponse<EditBody>().settings(list.stream().map(this::createEditBody).collect(Collectors.toList()))
+ .total(pager.getAllRecordCount()).status(ApiResult.Status.OK).result());
}
// GET /api/admin/user/setting/{id}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/ApiAdminWebauthAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/ApiAdminWebauthAction.java
index 661075934..e3e3f7a1b 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/ApiAdminWebauthAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/ApiAdminWebauthAction.java
@@ -61,9 +61,9 @@ public class ApiAdminWebauthAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final WebAuthPager pager = copyBeanToNewBean(body, WebAuthPager.class);
final List<WebAuthentication> list = webAuthService.getWebAuthenticationList(pager);
- return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(list.stream().map(this::createEditBody).collect(Collectors.toList())).total(pager.getAllRecordCount())
- .status(ApiResult.Status.OK).result());
+ return asJson(
+ new ApiResult.ApiConfigsResponse<EditBody>().settings(list.stream().map(this::createEditBody).collect(Collectors.toList()))
+ .total(pager.getAllRecordCount()).status(ApiResult.Status.OK).result());
}
// GET /api/admin/webauth/setting/{id}
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/ApiAdminWebconfigAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/ApiAdminWebconfigAction.java
index 20d09d484..c6db5eeb2 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/ApiAdminWebconfigAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/ApiAdminWebconfigAction.java
@@ -62,9 +62,9 @@ public class ApiAdminWebconfigAction extends FessApiAdminAction {
validateApi(body, messages -> {});
final WebConfigPager pager = copyBeanToNewBean(body, WebConfigPager.class);
final List<WebConfig> list = webConfigService.getWebConfigList(pager);
- return asJson(new ApiResult.ApiConfigsResponse<EditBody>()
- .settings(list.stream().map(this::createEditBody).collect(Collectors.toList())).total(pager.getAllRecordCount())
- .status(ApiResult.Status.OK).result());
+ return asJson(
+ new ApiResult.ApiConfigsResponse<EditBody>().settings(list.stream().map(this::createEditBody).collect(Collectors.toList()))
+ .total(pager.getAllRecordCount()).status(ApiResult.Status.OK).result());
}
// GET /api/admin/webconfig/setting/{id}
@@ -138,13 +138,10 @@ public class ApiAdminWebconfigAction extends FessApiAdminAction {
copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
});
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- body.permissions =
- stream(entity.getPermissions()).get(
- stream -> stream.map(s -> permissionHelper.decode(s)).filter(StringUtil::isNotBlank).distinct()
- .collect(Collectors.joining("\n")));
- body.virtualHosts =
- stream(entity.getVirtualHosts()).get(
- stream -> stream.filter(StringUtil::isNotBlank).distinct().map(String::trim).collect(Collectors.joining("\n")));
+ body.permissions = stream(entity.getPermissions()).get(stream -> stream.map(s -> permissionHelper.decode(s))
+ .filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
+ body.virtualHosts = stream(entity.getVirtualHosts())
+ .get(stream -> stream.filter(StringUtil::isNotBlank).distinct().map(String::trim).collect(Collectors.joining("\n")));
return body;
}
}
diff --git a/src/main/java/org/codelibs/fess/app/web/base/FessAdminAction.java b/src/main/java/org/codelibs/fess/app/web/base/FessAdminAction.java
index cc0d962a2..c0ccca33b 100644
--- a/src/main/java/org/codelibs/fess/app/web/base/FessAdminAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/base/FessAdminAction.java
@@ -51,9 +51,8 @@ public abstract class FessAdminAction extends FessBaseAction {
super.setupHtmlData(runtime);
systemHelper.setupAdminHtmlData(this, runtime);
- final Boolean editable =
- getUserBean().map(user -> user.hasRoles(fessConfig.getAuthenticationAdminRolesAsArray()) || user.hasRole(getActionRole()))
- .orElse(false);
+ final Boolean editable = getUserBean()
+ .map(user -> user.hasRoles(fessConfig.getAuthenticationAdminRolesAsArray()) || user.hasRole(getActionRole())).orElse(false);
runtime.registerData("editable", editable);
runtime.registerData("editableClass", editable ? StringUtil.EMPTY : "disabled");
final String forumLink = systemHelper.getForumLink();
diff --git a/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java b/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java
index 58fd7ae5f..175f46924 100644
--- a/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java
@@ -131,11 +131,8 @@ public abstract class FessSearchAction extends FessBaseAction {
final String username = systemHelper.getUsername();
runtime.registerData("username", username);
runtime.registerData("editableUser", fessLoginAssist.getSavedUserBean().map(FessUserBean::isEditable).orElse(false));
- runtime.registerData(
- "adminUser",
- fessConfig.isAdminUser(username)
- || fessLoginAssist.getSavedUserBean().map(user -> user.hasRoles(fessConfig.getAuthenticationAdminRolesAsArray()))
- .orElse(false));
+ runtime.registerData("adminUser", fessConfig.isAdminUser(username) || fessLoginAssist.getSavedUserBean()
+ .map(user -> user.hasRoles(fessConfig.getAuthenticationAdminRolesAsArray())).orElse(false));
runtime.registerData("pageLoginLink", fessConfig.isLoginLinkEnabled());
}
diff --git a/src/main/java/org/codelibs/fess/app/web/cache/CacheAction.java b/src/main/java/org/codelibs/fess/app/web/cache/CacheAction.java
index ce1e0edd6..dd2717644 100644
--- a/src/main/java/org/codelibs/fess/app/web/cache/CacheAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/cache/CacheAction.java
@@ -69,9 +69,8 @@ public class CacheAction extends FessSearchAction {
return redirect(ErrorAction.class);
}
- final StreamResponse response =
- asStream(DocumentUtil.getValue(doc, fessConfig.getIndexFieldDocId(), String.class)).contentType("text/html; charset=UTF-8")
- .data(content.getBytes(Constants.CHARSET_UTF_8));
+ final StreamResponse response = asStream(DocumentUtil.getValue(doc, fessConfig.getIndexFieldDocId(), String.class))
+ .contentType("text/html; charset=UTF-8").data(content.getBytes(Constants.CHARSET_UTF_8));
response.headerContentDispositionInline(); // TODO will be fixed in lastaflute
return response;
}
diff --git a/src/main/java/org/codelibs/fess/app/web/go/GoAction.java b/src/main/java/org/codelibs/fess/app/web/go/GoAction.java
index 67652f3ce..22fd1f025 100644
--- a/src/main/java/org/codelibs/fess/app/web/go/GoAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/go/GoAction.java
@@ -72,9 +72,8 @@ public class GoAction extends FessSearchAction {
Map<String, Object> doc = null;
try {
- doc =
- searchHelper.getDocumentByDocId(form.docId,
- new String[] { fessConfig.getIndexFieldUrl(), fessConfig.getIndexFieldConfigId() }, getUserBean()).orElse(null);
+ doc = searchHelper.getDocumentByDocId(form.docId,
+ new String[] { fessConfig.getIndexFieldUrl(), fessConfig.getIndexFieldConfigId() }, getUserBean()).orElse(null);
} catch (final Exception e) {
logger.warn("Failed to request: " + form.docId, e);
}
diff --git a/src/main/java/org/codelibs/fess/app/web/profile/ProfileAction.java b/src/main/java/org/codelibs/fess/app/web/profile/ProfileAction.java
index 0a0cfb2d2..ca02ade1e 100644
--- a/src/main/java/org/codelibs/fess/app/web/profile/ProfileAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/profile/ProfileAction.java
@@ -97,7 +97,7 @@ public class ProfileAction extends FessSearchAction {
}
protected HtmlResponse asIndexHtml() {
- return getUserBean().map(u -> asHtml(virtualHost(path_Profile_IndexJsp)).useForm(ProfileForm.class)).orElseGet(
- () -> redirect(LoginAction.class));
+ return getUserBean().map(u -> asHtml(virtualHost(path_Profile_IndexJsp)).useForm(ProfileForm.class))
+ .orElseGet(() -> redirect(LoginAction.class));
}
}
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 9b43bfe54..ab84aa35b 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
@@ -151,22 +151,21 @@ public class SearchAction extends FessSearchAction {
form.lang = searchHelper.getLanguages(request, form);
final WebRenderData renderData = new WebRenderData();
searchHelper.search(form, renderData, getUserBean());
- return asHtml(virtualHost(path_SearchJsp)).renderWith(
- data -> {
- if (form.hasConditionQuery()) {
- form.q = renderData.getSearchQuery();
- }
- renderData.register(data);
- RenderDataUtil.register(data, "displayQuery",
- getDisplayQuery(form, labelTypeHelper.getLabelTypeItemList(SearchRequestType.SEARCH)));
- createPagingQuery(form);
- final String[] relatedContents = relatedContentHelper.getRelatedContents(form.getQuery());
- RenderDataUtil.register(data, "relatedContents", relatedContents);
- final String[] relatedQueries = relatedQueryHelper.getRelatedQueries(form.getQuery());
- if (relatedQueries.length > 0) {
- RenderDataUtil.register(data, "relatedQueries", relatedQueries);
- }
- });
+ return asHtml(virtualHost(path_SearchJsp)).renderWith(data -> {
+ if (form.hasConditionQuery()) {
+ form.q = renderData.getSearchQuery();
+ }
+ renderData.register(data);
+ RenderDataUtil.register(data, "displayQuery",
+ getDisplayQuery(form, labelTypeHelper.getLabelTypeItemList(SearchRequestType.SEARCH)));
+ createPagingQuery(form);
+ final String[] relatedContents = relatedContentHelper.getRelatedContents(form.getQuery());
+ RenderDataUtil.register(data, "relatedContents", relatedContents);
+ final String[] relatedQueries = relatedQueryHelper.getRelatedQueries(form.getQuery());
+ if (relatedQueries.length > 0) {
+ RenderDataUtil.register(data, "relatedQueries", relatedQueries);
+ }
+ });
} catch (final InvalidQueryException e) {
if (logger.isDebugEnabled()) {
logger.debug(e.getMessage(), e);
@@ -228,9 +227,8 @@ public class SearchAction extends FessSearchAction {
protected void createPagingQuery(final SearchForm form) {
final List<String> pagingQueryList = new ArrayList<>();
if (form.ex_q != null) {
- stream(form.ex_q).of(
- stream -> stream.filter(StringUtil::isNotBlank).distinct()
- .forEach(q -> pagingQueryList.add("ex_q=" + LaFunctions.u(q))));
+ stream(form.ex_q).of(stream -> stream.filter(StringUtil::isNotBlank).distinct()
+ .forEach(q -> pagingQueryList.add("ex_q=" + LaFunctions.u(q))));
}
if (StringUtil.isNotBlank(form.sort)) {
pagingQueryList.add("sort=" + LaFunctions.u(form.sort));
@@ -255,27 +253,16 @@ public class SearchAction extends FessSearchAction {
}
}
}
- form.fields
- .entrySet()
- .stream()
- .filter(e -> e.getValue() != null)
- .forEach(
- e -> {
- final String key = LaFunctions.u(e.getKey());
- stream(e.getValue()).of(
- stream -> stream.filter(StringUtil::isNotBlank).forEach(
- s -> pagingQueryList.add("fields." + key + "=" + LaFunctions.u(s))));
- });
- form.as.entrySet()
- .stream()
- .filter(e -> e.getValue() != null)
- .forEach(
- e -> {
- final String key = LaFunctions.u(e.getKey());
- stream(e.getValue()).of(
- stream -> stream.filter(StringUtil::isNotBlank).forEach(
- s -> pagingQueryList.add("as." + key + "=" + LaFunctions.u(s))));
- });
+ form.fields.entrySet().stream().filter(e -> e.getValue() != null).forEach(e -> {
+ final String key = LaFunctions.u(e.getKey());
+ stream(e.getValue()).of(stream -> stream.filter(StringUtil::isNotBlank)
+ .forEach(s -> pagingQueryList.add("fields." + key + "=" + LaFunctions.u(s))));
+ });
+ form.as.entrySet().stream().filter(e -> e.getValue() != null).forEach(e -> {
+ final String key = LaFunctions.u(e.getKey());
+ stream(e.getValue()).of(stream -> stream.filter(StringUtil::isNotBlank)
+ .forEach(s -> pagingQueryList.add("as." + key + "=" + LaFunctions.u(s))));
+ });
request.setAttribute(Constants.PAGING_QUERY_LIST, pagingQueryList);
}
diff --git a/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java b/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java
index 3b208206c..777df1f58 100644
--- a/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java
+++ b/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java
@@ -98,14 +98,10 @@ public class FessCrawlerThread extends CrawlerThread {
if (logger.isDebugEnabled()) {
logger.debug("Searching indexed document: {}", id);
}
- final Map<String, Object> document =
- indexingHelper.getDocument(
- fessEsClient,
- id,
- new String[] { fessConfig.getIndexFieldId(), fessConfig.getIndexFieldLastModified(),
- fessConfig.getIndexFieldAnchor(), fessConfig.getIndexFieldSegment(),
- fessConfig.getIndexFieldExpires(), fessConfig.getIndexFieldClickCount(),
- fessConfig.getIndexFieldFavoriteCount() });
+ final Map<String, Object> document = indexingHelper.getDocument(fessEsClient, id,
+ new String[] { fessConfig.getIndexFieldId(), fessConfig.getIndexFieldLastModified(),
+ fessConfig.getIndexFieldAnchor(), fessConfig.getIndexFieldSegment(), fessConfig.getIndexFieldExpires(),
+ fessConfig.getIndexFieldClickCount(), fessConfig.getIndexFieldFavoriteCount() });
if (document == null) {
storeChildUrlsToQueue(urlQueue, getChildUrlSet(fessEsClient, id));
return true;
@@ -246,8 +242,8 @@ public class FessCrawlerThread extends CrawlerThread {
final String url = urlQueue.getUrl();
final FailureUrlService failureUrlService = ComponentUtil.getComponent(FailureUrlService.class);
- failureUrlService.store(crawlingConfig, ContentNotFoundException.class.getCanonicalName(), url, new ContentNotFoundException(
- urlQueue.getParentUrl(), url));
+ failureUrlService.store(crawlingConfig, ContentNotFoundException.class.getCanonicalName(), url,
+ new ContentNotFoundException(urlQueue.getParentUrl(), url));
}
}
diff --git a/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java b/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java
index 43d956acf..41da57562 100644
--- a/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java
+++ b/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java
@@ -108,64 +108,60 @@ public abstract class AbstractFessFileTransformer extends AbstractTransformer im
getLogger().debug("ExtractData: {}", extractData);
}
// meta
- extractData
- .getKeySet()
- .stream()
- .filter(k -> extractData.getValues(k) != null)
- .forEach(key -> {
- final String[] values = extractData.getValues(key);
- metaDataMap.put(key, values);
-
- // meta -> content
- if (fessConfig.isCrawlerMetadataContentIncluded(key)) {
- final String joinedValue = StringUtils.join(values, ' ');
- if (StringUtil.isNotBlank(joinedValue)) {
- if (contentMetaBuf.length() > 0) {
- contentMetaBuf.append(' ');
- }
- contentMetaBuf.append(joinedValue.trim());
- }
- }
+ extractData.getKeySet().stream().filter(k -> extractData.getValues(k) != null).forEach(key -> {
+ final String[] values = extractData.getValues(key);
+ metaDataMap.put(key, values);
+
+ // meta -> content
+ if (fessConfig.isCrawlerMetadataContentIncluded(key)) {
+ final String joinedValue = StringUtils.join(values, ' ');
+ if (StringUtil.isNotBlank(joinedValue)) {
+ if (contentMetaBuf.length() > 0) {
+ contentMetaBuf.append(' ');
+ }
+ contentMetaBuf.append(joinedValue.trim());
+ }
+ }
- final Tuple3<String, String, String> mapping = fessConfig.getCrawlerMetadataNameMapping(key);
- if (mapping != null) {
- if (Constants.MAPPING_TYPE_ARRAY.equalsIgnoreCase(mapping.getValue2())) {
- dataMap.put(mapping.getValue1(), values);
- } else if (Constants.MAPPING_TYPE_STRING.equalsIgnoreCase(mapping.getValue2())) {
- final String joinedValue = StringUtils.join(values, ' ');
- dataMap.put(mapping.getValue1(), joinedValue.trim());
- } else if (values.length == 1) {
- try {
- if (Constants.MAPPING_TYPE_LONG.equalsIgnoreCase(mapping.getValue2())) {
- dataMap.put(mapping.getValue1(), Long.parseLong(values[0]));
- } else if (Constants.MAPPING_TYPE_DOUBLE.equalsIgnoreCase(mapping.getValue2())) {
- dataMap.put(mapping.getValue1(), Double.parseDouble(values[0]));
- } else if (Constants.MAPPING_TYPE_DATE.equalsIgnoreCase(mapping.getValue2())
- || Constants.MAPPING_TYPE_PDF_DATE.equalsIgnoreCase(mapping.getValue2())) {
- final String dateFormate;
- if (StringUtil.isNotBlank(mapping.getValue3())) {
- dateFormate = mapping.getValue3();
- } else if (Constants.MAPPING_TYPE_PDF_DATE.equalsIgnoreCase(mapping.getValue2())) {
- dateFormate = mapping.getValue2();
- } else {
- dateFormate = Constants.DATE_OPTIONAL_TIME;
- }
- final Date dt = FessFunctions.parseDate(values[0], dateFormate);
- if (dt != null) {
- dataMap.put(mapping.getValue1(), FessFunctions.formatDate(dt));
- } else {
- logger.warn("Failed to parse {}", mapping.toString());
- }
- } else {
- logger.warn("Unknown mapping type: {}={}", key, mapping);
- }
- } catch (final Exception e) {
- logger.warn("Failed to parse " + values[0], e);
- }
+ final Tuple3<String, String, String> mapping = fessConfig.getCrawlerMetadataNameMapping(key);
+ if (mapping != null) {
+ if (Constants.MAPPING_TYPE_ARRAY.equalsIgnoreCase(mapping.getValue2())) {
+ dataMap.put(mapping.getValue1(), values);
+ } else if (Constants.MAPPING_TYPE_STRING.equalsIgnoreCase(mapping.getValue2())) {
+ final String joinedValue = StringUtils.join(values, ' ');
+ dataMap.put(mapping.getValue1(), joinedValue.trim());
+ } else if (values.length == 1) {
+ try {
+ if (Constants.MAPPING_TYPE_LONG.equalsIgnoreCase(mapping.getValue2())) {
+ dataMap.put(mapping.getValue1(), Long.parseLong(values[0]));
+ } else if (Constants.MAPPING_TYPE_DOUBLE.equalsIgnoreCase(mapping.getValue2())) {
+ dataMap.put(mapping.getValue1(), Double.parseDouble(values[0]));
+ } else if (Constants.MAPPING_TYPE_DATE.equalsIgnoreCase(mapping.getValue2())
+ || Constants.MAPPING_TYPE_PDF_DATE.equalsIgnoreCase(mapping.getValue2())) {
+ final String dateFormate;
+ if (StringUtil.isNotBlank(mapping.getValue3())) {
+ dateFormate = mapping.getValue3();
+ } else if (Constants.MAPPING_TYPE_PDF_DATE.equalsIgnoreCase(mapping.getValue2())) {
+ dateFormate = mapping.getValue2();
+ } else {
+ dateFormate = Constants.DATE_OPTIONAL_TIME;
}
+ final Date dt = FessFunctions.parseDate(values[0], dateFormate);
+ if (dt != null) {
+ dataMap.put(mapping.getValue1(), FessFunctions.formatDate(dt));
+ } else {
+ logger.warn("Failed to parse {}", mapping.toString());
+ }
+ } else {
+ logger.warn("Unknown mapping type: {}={}", key, mapping);
}
+ } catch (final Exception e) {
+ logger.warn("Failed to parse " + values[0], e);
+ }
+ }
+ }
- });
+ });
} catch (final Exception e) {
final CrawlingAccessException rcae = new CrawlingAccessException("Could not get a text from " + responseData.getUrl(), e);
rcae.setLogLevel(CrawlingAccessException.WARN);
@@ -223,8 +219,8 @@ public abstract class AbstractFessFileTransformer extends AbstractTransformer im
responseData.addMetaData(Extractor.class.getSimpleName(), extractor);
final String body = documentHelper.getContent(crawlingConfig, responseData, bodyBase, dataMap);
putResultDataBody(dataMap, fessConfig.getIndexFieldContent(), body);
- if ((Constants.TRUE.equalsIgnoreCase(fieldConfigMap.get(fessConfig.getIndexFieldCache())) || fessConfig
- .isCrawlerDocumentCacheEnabled()) && fessConfig.isSupportedDocumentCacheMimetypes(mimeType)) {
+ if ((Constants.TRUE.equalsIgnoreCase(fieldConfigMap.get(fessConfig.getIndexFieldCache()))
+ || fessConfig.isCrawlerDocumentCacheEnabled()) && fessConfig.isSupportedDocumentCacheMimetypes(mimeType)) {
if (responseData.getContentLength() > 0
&& responseData.getContentLength() <= fessConfig.getCrawlerDocumentCacheMaxSizeAsInteger().longValue()) {
@@ -244,11 +240,8 @@ public abstract class AbstractFessFileTransformer extends AbstractTransformer im
dataMap.remove(titleField);
if (url.endsWith("/")) {
if (StringUtil.isNotBlank(content)) {
- putResultDataBody(
- dataMap,
- titleField,
- documentHelper.getDigest(responseData, body, dataMap,
- fessConfig.getCrawlerDocumentFileMaxTitleLengthAsInteger()));
+ putResultDataBody(dataMap, titleField, documentHelper.getDigest(responseData, body, dataMap,
+ fessConfig.getCrawlerDocumentFileMaxTitleLengthAsInteger()));
} else {
putResultDataBody(dataMap, titleField, fessConfig.getCrawlerDocumentFileNoTitleLabel());
}
@@ -388,8 +381,8 @@ public abstract class AbstractFessFileTransformer extends AbstractTransformer im
if (configParam != null) {
final String keepOriginalBody = configParam.get(Config.KEEP_ORIGINAL_BODY);
if (StringUtil.isNotBlank(keepOriginalBody)) {
- params.put(TikaExtractor.NORMALIZE_TEXT, Constants.TRUE.equalsIgnoreCase(keepOriginalBody) ? Constants.FALSE
- : Constants.TRUE);
+ params.put(TikaExtractor.NORMALIZE_TEXT,
+ Constants.TRUE.equalsIgnoreCase(keepOriginalBody) ? Constants.FALSE : Constants.TRUE);
}
}
return params;
diff --git a/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java b/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java
index ae3610c6e..849b2207f 100644
--- a/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java
+++ b/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java
@@ -395,8 +395,8 @@ public class FessXpathTransformer extends XpathTransformer implements FessTransf
final String body = getSingleNodeValue(document, getContentXpath(fessConfig, xpathConfigMap), prunedContent);
putResultDataBody(dataMap, fessConfig.getIndexFieldContent(),
documentHelper.getContent(crawlingConfig, responseData, body, dataMap));
- if ((Constants.TRUE.equalsIgnoreCase(fieldConfigMap.get(fessConfig.getIndexFieldCache())) || fessConfig
- .isCrawlerDocumentCacheEnabled()) && fessConfig.isSupportedDocumentCacheMimetypes(mimeType)) {
+ if ((Constants.TRUE.equalsIgnoreCase(fieldConfigMap.get(fessConfig.getIndexFieldCache()))
+ || fessConfig.isCrawlerDocumentCacheEnabled()) && fessConfig.isSupportedDocumentCacheMimetypes(mimeType)) {
if (responseData.getContentLength() > 0
&& responseData.getContentLength() <= fessConfig.getCrawlerDocumentCacheMaxSizeAsInteger().longValue()) {
String charSet = responseData.getCharSet();
diff --git a/src/main/java/org/codelibs/fess/dict/DictionaryManager.java b/src/main/java/org/codelibs/fess/dict/DictionaryManager.java
index b4acc62df..4c3a34064 100644
--- a/src/main/java/org/codelibs/fess/dict/DictionaryManager.java
+++ b/src/main/java/org/codelibs/fess/dict/DictionaryManager.java
@@ -50,31 +50,27 @@ public class DictionaryManager {
}
public DictionaryFile<? extends DictionaryItem>[] getDictionaryFiles() {
- try (CurlResponse response =
- ComponentUtil.getCurlHelper().get("/_configsync/file").param("fields", "path,@timestamp")
- .param("size", ComponentUtil.getFessConfig().getPageDictionaryMaxFetchSize()).execute()) {
+ try (CurlResponse response = ComponentUtil.getCurlHelper().get("/_configsync/file").param("fields", "path,@timestamp")
+ .param("size", ComponentUtil.getFessConfig().getPageDictionaryMaxFetchSize()).execute()) {
final Map<String, Object> contentMap = response.getContent(EcrCurl.jsonParser());
@SuppressWarnings("unchecked")
final List<Map<String, Object>> fileList = (List<Map<String, Object>>) contentMap.get("file");
- return fileList
- .stream()
- .map(fileMap -> {
- try {
- final String path = fileMap.get("path").toString();
- final Date timestamp =
- new SimpleDateFormat(Constants.DATE_FORMAT_ISO_8601_EXTEND_UTC).parse(fileMap.get("@timestamp")
- .toString());
- for (final DictionaryCreator creator : creatorList) {
- final DictionaryFile<? extends DictionaryItem> file = creator.create(path, timestamp);
- if (file != null) {
- return file;
- }
- }
- } catch (final Exception e) {
- logger.warn("Failed to load " + fileMap, e);
+ return fileList.stream().map(fileMap -> {
+ try {
+ final String path = fileMap.get("path").toString();
+ final Date timestamp =
+ new SimpleDateFormat(Constants.DATE_FORMAT_ISO_8601_EXTEND_UTC).parse(fileMap.get("@timestamp").toString());
+ for (final DictionaryCreator creator : creatorList) {
+ final DictionaryFile<? extends DictionaryItem> file = creator.create(path, timestamp);
+ if (file != null) {
+ return file;
}
- return null;
- }).filter(file -> file != null).toArray(n -> new DictionaryFile<?>[n]);
+ }
+ } catch (final Exception e) {
+ logger.warn("Failed to load " + fileMap, e);
+ }
+ return null;
+ }).filter(file -> file != null).toArray(n -> new DictionaryFile<?>[n]);
} catch (final IOException e) {
throw new DictionaryException("Failed to access dictionaries", e);
}
@@ -96,18 +92,17 @@ public class DictionaryManager {
}
// TODO use stream
- try (CurlResponse response =
- ComponentUtil.getCurlHelper().post("/_configsync/file").param("path", dictFile.getPath())
- .body(FileUtil.readUTF8(file)).execute()) {
- final Map<String, Object> contentMap = response.getContent(EcrCurl.jsonParser());
- if (!Constants.TRUE.equalsIgnoreCase(contentMap.get("acknowledged").toString())) {
- throw new DictionaryException("Failed to update " + dictFile.getPath());
- }
- } catch (final IOException e) {
- throw new DictionaryException("Failed to update " + dictFile.getPath(), e);
+ try (CurlResponse response = ComponentUtil.getCurlHelper().post("/_configsync/file").param("path", dictFile.getPath())
+ .body(FileUtil.readUTF8(file)).execute()) {
+ final Map<String, Object> contentMap = response.getContent(EcrCurl.jsonParser());
+ if (!Constants.TRUE.equalsIgnoreCase(contentMap.get("acknowledged").toString())) {
+ throw new DictionaryException("Failed to update " + dictFile.getPath());
}
+ } catch (final IOException e) {
+ throw new DictionaryException("Failed to update " + dictFile.getPath(), e);
+ }
- }).orElse(() -> {
+ }).orElse(() -> {
throw new DictionaryException(dictFile.getPath() + " does not exist.");
});
}
diff --git a/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java b/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java
index 29476df45..33e3b7a08 100644
--- a/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java
+++ b/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java
@@ -229,8 +229,8 @@ public class FileListIndexUpdateCallbackImpl implements IndexUpdateCallback {
}
return null;
} catch (final ChildUrlsException e) {
- throw new DataStoreCrawlingException(url, "Redirected to "
- + e.getChildUrlList().stream().map(RequestData::getUrl).collect(Collectors.joining(", ")), e);
+ throw new DataStoreCrawlingException(url,
+ "Redirected to " + e.getChildUrlList().stream().map(RequestData::getUrl).collect(Collectors.joining(", ")), e);
} catch (final Exception e) {
throw new DataStoreCrawlingException(url, "Failed to add: " + dataMap, e);
}
diff --git a/src/main/java/org/codelibs/fess/entity/FacetInfo.java b/src/main/java/org/codelibs/fess/entity/FacetInfo.java
index ffd618fe4..4f3ecd3f3 100644
--- a/src/main/java/org/codelibs/fess/entity/FacetInfo.java
+++ b/src/main/java/org/codelibs/fess/entity/FacetInfo.java
@@ -46,9 +46,8 @@ public class FacetInfo {
public void init() {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
if (StringUtil.isNotBlank(fessConfig.getQueryFacetFields())) {
- field =
- StreamUtil.split(fessConfig.getQueryFacetFields(), ",").get(
- stream -> stream.map(String::trim).filter(StringUtil::isNotEmpty).distinct().toArray(n -> new String[n]));
+ field = StreamUtil.split(fessConfig.getQueryFacetFields(), ",")
+ .get(stream -> stream.map(String::trim).filter(StringUtil::isNotEmpty).distinct().toArray(n -> new String[n]));
}
if (StringUtil.isNotBlank(fessConfig.getQueryFacetFieldsSize())) {
size = fessConfig.getQueryFacetFieldsSizeAsInteger();
diff --git a/src/main/java/org/codelibs/fess/entity/GeoInfo.java b/src/main/java/org/codelibs/fess/entity/GeoInfo.java
index b4f0eac01..516d0f3b8 100644
--- a/src/main/java/org/codelibs/fess/entity/GeoInfo.java
+++ b/src/main/java/org/codelibs/fess/entity/GeoInfo.java
@@ -43,45 +43,42 @@ public class GeoInfo {
final String[] geoFields = fessConfig.getQueryGeoFieldsAsArray();
final Map<String, List<QueryBuilder>> geoMap = new HashMap<>();
- stream(request.getParameterMap()).of(
- stream -> stream.filter(e -> e.getKey().startsWith("geo.") && e.getKey().endsWith(".point")).forEach(
- e -> {
- final String key = e.getKey();
- for (final String geoField : geoFields) {
- if (key.startsWith("geo." + geoField + ".")) {
- final String distanceKey = key.replaceFirst(".point$", ".distance");
- final String distance = request.getParameter(distanceKey);
- if (StringUtil.isNotBlank(distance)) {
- stream(e.getValue()).of(
- s -> s.forEach(pt -> {
- List<QueryBuilder> list = geoMap.get(geoField);
- if (list == null) {
- list = new ArrayList<>();
- geoMap.put(geoField, list);
- }
- final String[] values = pt.split(",");
- if (values.length == 2) {
- try {
- final double lat = Double.parseDouble(values[0]);
- final double lon = Double.parseDouble(values[1]);
- list.add(QueryBuilders.geoDistanceQuery(geoField).distance(distance)
- .point(lat, lon));
- } catch (final Exception ex) {
- throw new InvalidQueryException(messages -> messages
- .addErrorsInvalidQueryUnknown(UserMessages.GLOBAL_PROPERTY_KEY), ex
- .getLocalizedMessage(), ex);
- }
- } else {
- throw new InvalidQueryException(messages -> messages
- .addErrorsInvalidQueryUnknown(UserMessages.GLOBAL_PROPERTY_KEY),
- "Invalid geo point: " + pt);
- }
- }));
+ stream(request.getParameterMap())
+ .of(stream -> stream.filter(e -> e.getKey().startsWith("geo.") && e.getKey().endsWith(".point")).forEach(e -> {
+ final String key = e.getKey();
+ for (final String geoField : geoFields) {
+ if (key.startsWith("geo." + geoField + ".")) {
+ final String distanceKey = key.replaceFirst(".point$", ".distance");
+ final String distance = request.getParameter(distanceKey);
+ if (StringUtil.isNotBlank(distance)) {
+ stream(e.getValue()).of(s -> s.forEach(pt -> {
+ List<QueryBuilder> list = geoMap.get(geoField);
+ if (list == null) {
+ list = new ArrayList<>();
+ geoMap.put(geoField, list);
}
- break;
- }
+ final String[] values = pt.split(",");
+ if (values.length == 2) {
+ try {
+ final double lat = Double.parseDouble(values[0]);
+ final double lon = Double.parseDouble(values[1]);
+ list.add(QueryBuilders.geoDistanceQuery(geoField).distance(distance).point(lat, lon));
+ } catch (final Exception ex) {
+ throw new InvalidQueryException(
+ messages -> messages.addErrorsInvalidQueryUnknown(UserMessages.GLOBAL_PROPERTY_KEY),
+ ex.getLocalizedMessage(), ex);
+ }
+ } else {
+ throw new InvalidQueryException(
+ messages -> messages.addErrorsInvalidQueryUnknown(UserMessages.GLOBAL_PROPERTY_KEY),
+ "Invalid geo point: " + pt);
+ }
+ }));
}
- }));
+ break;
+ }
+ }
+ }));
final QueryBuilder[] queryBuilders = geoMap.values().stream().map(list -> {
if (list.size() == 1) {
diff --git a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
index d8b03d820..cafb68067 100644
--- a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
+++ b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
@@ -349,12 +349,10 @@ public class FessEsClient implements Client {
}
public boolean reindex(final String fromIndex, final String toIndex, final boolean waitForCompletion) {
- final String source =
- "{\"source\":{\"index\":\"" + fromIndex + "\"},\"dest\":{\"index\":\"" + toIndex + "\"}," + "\"script\":{\"source\":\""
- + ComponentUtil.getLanguageHelper().getReindexScriptSource() + "\"}}";
- try (CurlResponse response =
- ComponentUtil.getCurlHelper().post("/_reindex").param("wait_for_completion", Boolean.toString(waitForCompletion))
- .body(source).execute()) {
+ final String source = "{\"source\":{\"index\":\"" + fromIndex + "\"},\"dest\":{\"index\":\"" + toIndex + "\"},"
+ + "\"script\":{\"source\":\"" + ComponentUtil.getLanguageHelper().getReindexScriptSource() + "\"}}";
+ try (CurlResponse response = ComponentUtil.getCurlHelper().post("/_reindex")
+ .param("wait_for_completion", Boolean.toString(waitForCompletion)).body(source).execute()) {
if (response.getHttpStatusCode() == 200) {
return true;
} else {
@@ -391,9 +389,8 @@ public class FessEsClient implements Client {
source = source.replaceAll(Pattern.quote("${fess.index.codec}"), fessConfig.getIndexCodec());
source = source.replaceAll(Pattern.quote("${fess.index.number_of_shards}"), numberOfShards);
source = source.replaceAll(Pattern.quote("${fess.index.auto_expand_replicas}"), autoExpandReplicas);
- final CreateIndexResponse indexResponse =
- client.admin().indices().prepareCreate(indexName).setSource(source, XContentType.JSON).execute()
- .actionGet(fessConfig.getIndexIndicesTimeout());
+ final CreateIndexResponse indexResponse = client.admin().indices().prepareCreate(indexName).setSource(source, XContentType.JSON)
+ .execute().actionGet(fessConfig.getIndexIndicesTimeout());
if (indexResponse.isAcknowledged()) {
logger.info("Created {} index.", indexName);
return true;
@@ -422,9 +419,8 @@ public class FessEsClient implements Client {
logger.warn("{} is not found.", mappingFile, e);
}
try {
- final AcknowledgedResponse putMappingResponse =
- client.admin().indices().preparePutMapping(indexName).setSource(source, XContentType.JSON).execute()
- .actionGet(fessConfig.getIndexIndicesTimeout());
+ final AcknowledgedResponse putMappingResponse = client.admin().indices().preparePutMapping(indexName)
+ .setSource(source, XContentType.JSON).execute().actionGet(fessConfig.getIndexIndicesTimeout());
if (putMappingResponse.isAcknowledged()) {
logger.info("Created {}/{} mapping.", indexName, docType);
} else {
@@ -479,22 +475,20 @@ public class FessEsClient implements Client {
try {
final File aliasConfigDir = ResourceUtil.getResourceAsFile(aliasConfigDirPath);
if (aliasConfigDir.isDirectory()) {
- stream(aliasConfigDir.listFiles((dir, name) -> name.endsWith(".json"))).of(
- stream -> stream.forEach(f -> {
- final String aliasName = f.getName().replaceFirst(".json$", "");
- String source = FileUtil.readUTF8(f);
- if (source.trim().equals("{}")) {
- source = null;
- }
- final AcknowledgedResponse response =
- client.admin().indices().prepareAliases().addAlias(createdIndexName, aliasName, source).execute()
- .actionGet(fessConfig.getIndexIndicesTimeout());
- if (response.isAcknowledged()) {
- logger.info("Created {} alias for {}", aliasName, createdIndexName);
- } else if (logger.isDebugEnabled()) {
- logger.debug("Failed to create {} alias for {}", aliasName, createdIndexName);
- }
- }));
+ stream(aliasConfigDir.listFiles((dir, name) -> name.endsWith(".json"))).of(stream -> stream.forEach(f -> {
+ final String aliasName = f.getName().replaceFirst(".json$", "");
+ String source = FileUtil.readUTF8(f);
+ if (source.trim().equals("{}")) {
+ source = null;
+ }
+ final AcknowledgedResponse response = client.admin().indices().prepareAliases()
+ .addAlias(createdIndexName, aliasName, source).execute().actionGet(fessConfig.getIndexIndicesTimeout());
+ if (response.isAcknowledged()) {
+ logger.info("Created {} alias for {}", aliasName, createdIndexName);
+ } else if (logger.isDebugEnabled()) {
+ logger.debug("Failed to create {} alias for {}", aliasName, createdIndexName);
+ }
+ }));
}
} catch (final ResourceNotFoundRuntimeException e) {
// ignore
@@ -504,28 +498,27 @@ public class FessEsClient implements Client {
}
protected void sendConfigFiles(final String index) {
- configListMap.getOrDefault(index, Collections.emptyList()).forEach(
- path -> {
- String source = null;
- final String filePath = indexConfigPath + "/" + index + "/" + path;
- try {
- source = FileUtil.readUTF8(filePath);
- try (CurlResponse response =
- ComponentUtil.getCurlHelper().post("/_configsync/file").param("path", path).body(source).execute()) {
- if (response.getHttpStatusCode() == 200) {
- logger.info("Register {} to {}", path, index);
- } else {
- if (response.getContentException() != null) {
- logger.warn("Invalid request for {}.", path, response.getContentException());
- } else {
- logger.warn("Invalid request for {}. The response is {}", path, response.getContentAsString());
- }
- }
+ configListMap.getOrDefault(index, Collections.emptyList()).forEach(path -> {
+ String source = null;
+ final String filePath = indexConfigPath + "/" + index + "/" + path;
+ try {
+ source = FileUtil.readUTF8(filePath);
+ try (CurlResponse response =
+ ComponentUtil.getCurlHelper().post("/_configsync/file").param("path", path).body(source).execute()) {
+ if (response.getHttpStatusCode() == 200) {
+ logger.info("Register {} to {}", path, index);
+ } else {
+ if (response.getContentException() != null) {
+ logger.warn("Invalid request for {}.", path, response.getContentException());
+ } else {
+ logger.warn("Invalid request for {}. The response is {}", path, response.getContentAsString());
}
- } catch (final Exception e) {
- logger.warn("Failed to register {}", filePath, e);
}
- });
+ }
+ } catch (final Exception e) {
+ logger.warn("Failed to register {}", filePath, e);
+ }
+ });
try (CurlResponse response = ComponentUtil.getCurlHelper().post("/_configsync/flush").execute()) {
if (response.getHttpStatusCode() == 200) {
logger.info("Flushed config files.");
@@ -545,34 +538,32 @@ public class FessEsClient implements Client {
try {
final BulkRequestBuilder builder = client.prepareBulk();
final ObjectMapper mapper = new ObjectMapper();
- Arrays.stream(FileUtil.readUTF8(dataPath).split("\n")).reduce(
- (prev, line) -> {
- try {
- if (StringUtil.isBlank(prev)) {
- final Map<String, Map<String, String>> result =
- mapper.readValue(line, new TypeReference<Map<String, Map<String, String>>>() {
- });
- if (result.containsKey("index") || result.containsKey("update")) {
- return line;
- } else if (result.containsKey("delete")) {
- return StringUtil.EMPTY;
- }
- } else {
- final Map<String, Map<String, String>> result =
- mapper.readValue(prev, new TypeReference<Map<String, Map<String, String>>>() {
- });
- if (result.containsKey("index")) {
- final IndexRequestBuilder requestBuilder =
- client.prepareIndex().setIndex(configIndex).setId(result.get("index").get("_id"))
- .setSource(line, XContentType.JSON);
- builder.add(requestBuilder);
- }
- }
- } catch (final Exception e) {
- logger.warn("Failed to parse {}", dataPath);
+ Arrays.stream(FileUtil.readUTF8(dataPath).split("\n")).reduce((prev, line) -> {
+ try {
+ if (StringUtil.isBlank(prev)) {
+ final Map<String, Map<String, String>> result =
+ mapper.readValue(line, new TypeReference<Map<String, Map<String, String>>>() {
+ });
+ if (result.containsKey("index") || result.containsKey("update")) {
+ return line;
+ } else if (result.containsKey("delete")) {
+ return StringUtil.EMPTY;
}
- return StringUtil.EMPTY;
- });
+ } else {
+ final Map<String, Map<String, String>> result =
+ mapper.readValue(prev, new TypeReference<Map<String, Map<String, String>>>() {
+ });
+ if (result.containsKey("index")) {
+ final IndexRequestBuilder requestBuilder = client.prepareIndex().setIndex(configIndex)
+ .setId(result.get("index").get("_id")).setSource(line, XContentType.JSON);
+ builder.add(requestBuilder);
+ }
+ }
+ } catch (final Exception e) {
+ logger.warn("Failed to parse {}", dataPath);
+ }
+ return StringUtil.EMPTY;
+ });
final BulkResponse response = builder.execute().actionGet(fessConfig.getIndexBulkTimeout());
if (response.hasFailures()) {
logger.warn("Failed to register {}: {}", dataPath, response.buildFailureMessage());
@@ -587,9 +578,8 @@ public class FessEsClient implements Client {
final long startTime = System.currentTimeMillis();
for (int i = 0; i < maxEsStatusRetry; i++) {
try {
- final ClusterHealthResponse response =
- client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute()
- .actionGet(fessConfig.getIndexHealthTimeout());
+ final ClusterHealthResponse response = client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute()
+ .actionGet(fessConfig.getIndexHealthTimeout());
if (logger.isDebugEnabled()) {
logger.debug("Elasticsearch Cluster Status: {}", response.getStatus());
}
@@ -602,10 +592,9 @@ public class FessEsClient implements Client {
}
ThreadUtil.sleep(1000L);
}
- final String message =
- "Elasticsearch (" + System.getProperty(Constants.FESS_ES_HTTP_ADDRESS)
- + ") is not available. Check the state of your Elasticsearch cluster (" + clusterName + ") in "
- + (System.currentTimeMillis() - startTime) + "ms.";
+ final String message = "Elasticsearch (" + System.getProperty(Constants.FESS_ES_HTTP_ADDRESS)
+ + ") is not available. Check the state of your Elasticsearch cluster (" + clusterName + ") in "
+ + (System.currentTimeMillis() - startTime) + "ms.";
throw new ContainerInitFailureException(message, cause);
}
@@ -658,11 +647,8 @@ public class FessEsClient implements Client {
final BiFunction<UpdateRequestBuilder, SearchHit, UpdateRequestBuilder> builder) {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
- SearchResponse response =
- option.apply(
- client.prepareSearch(index).setScroll(scrollForUpdate).setSize(sizeForUpdate)
- .setPreference(Constants.SEARCH_PREFERENCE_LOCAL)).execute()
- .actionGet(fessConfig.getIndexScrollSearchTimeout());
+ SearchResponse response = option.apply(client.prepareSearch(index).setScroll(scrollForUpdate).setSize(sizeForUpdate)
+ .setPreference(Constants.SEARCH_PREFERENCE_LOCAL)).execute().actionGet(fessConfig.getIndexScrollSearchTimeout());
int count = 0;
String scrollId = response.getScrollId();
@@ -688,9 +674,8 @@ public class FessEsClient implements Client {
throw new IllegalBehaviorStateException(bulkResponse.buildFailureMessage());
}
- response =
- client.prepareSearchScroll(scrollId).setScroll(scrollForUpdate).execute()
- .actionGet(fessConfig.getIndexBulkTimeout());
+ response = client.prepareSearchScroll(scrollId).setScroll(scrollForUpdate).execute()
+ .actionGet(fessConfig.getIndexBulkTimeout());
if (!scrollId.equals(response.getScrollId())) {
deleteScrollContext(scrollId);
}
@@ -705,10 +690,9 @@ public class FessEsClient implements Client {
public long deleteByQuery(final String index, final QueryBuilder queryBuilder) {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
- SearchResponse response =
- client.prepareSearch(index).setScroll(scrollForDelete).setSize(sizeForDelete)
- .setFetchSource(new String[] { fessConfig.getIndexFieldId() }, null).setQuery(queryBuilder)
- .setPreference(Constants.SEARCH_PREFERENCE_LOCAL).execute().actionGet(fessConfig.getIndexScrollSearchTimeout());
+ SearchResponse response = client.prepareSearch(index).setScroll(scrollForDelete).setSize(sizeForDelete)
+ .setFetchSource(new String[] { fessConfig.getIndexFieldId() }, null).setQuery(queryBuilder)
+ .setPreference(Constants.SEARCH_PREFERENCE_LOCAL).execute().actionGet(fessConfig.getIndexScrollSearchTimeout());
int count = 0;
String scrollId = response.getScrollId();
@@ -730,9 +714,8 @@ public class FessEsClient implements Client {
throw new IllegalBehaviorStateException(bulkResponse.buildFailureMessage());
}
- response =
- client.prepareSearchScroll(scrollId).setScroll(scrollForDelete).execute()
- .actionGet(fessConfig.getIndexBulkTimeout());
+ response = client.prepareSearchScroll(scrollId).setScroll(scrollForDelete).execute()
+ .actionGet(fessConfig.getIndexBulkTimeout());
if (!scrollId.equals(response.getScrollId())) {
deleteScrollContext(scrollId);
}
@@ -828,9 +811,8 @@ public class FessEsClient implements Client {
}
}
- response =
- client.prepareSearchScroll(scrollId).setScroll(scrollForDelete).execute()
- .actionGet(fessConfig.getIndexBulkTimeout());
+ response = client.prepareSearchScroll(scrollId).setScroll(scrollForDelete).execute()
+ .actionGet(fessConfig.getIndexBulkTimeout());
scrollId = response.getScrollId();
}
} catch (final SearchPhaseExecutionException e) {
@@ -847,36 +829,29 @@ public class FessEsClient implements Client {
}
public OptionalEntity<Map<String, Object>> getDocument(final String index, final SearchCondition<SearchRequestBuilder> condition) {
- return getDocument(
- index,
- condition,
- (response, hit) -> {
- final FessConfig fessConfig = ComponentUtil.getFessConfig();
- final Map<String, Object> source = hit.getSourceAsMap();
- if (source != null) {
- final Map<String, Object> docMap = new HashMap<>(source);
- docMap.put(fessConfig.getIndexFieldId(), hit.getId());
- docMap.put(fessConfig.getIndexFieldVersion(), hit.getVersion());
- docMap.put(fessConfig.getIndexFieldSeqNo(), hit.getSeqNo());
- docMap.put(fessConfig.getIndexFieldPrimaryTerm(), hit.getPrimaryTerm());
- return docMap;
- }
- final Map<String, DocumentField> fields = hit.getFields();
- if (fields != null) {
- final Map<String, Object> docMap =
- fields.entrySet()
- .stream()
- .collect(
- Collectors.toMap(Entry<String, DocumentField>::getKey, e -> (Object) e.getValue()
- .getValues()));
- docMap.put(fessConfig.getIndexFieldId(), hit.getId());
- docMap.put(fessConfig.getIndexFieldVersion(), hit.getVersion());
- docMap.put(fessConfig.getIndexFieldSeqNo(), hit.getSeqNo());
- docMap.put(fessConfig.getIndexFieldPrimaryTerm(), hit.getPrimaryTerm());
- return docMap;
- }
- return null;
- });
+ return getDocument(index, condition, (response, hit) -> {
+ final FessConfig fessConfig = ComponentUtil.getFessConfig();
+ final Map<String, Object> source = hit.getSourceAsMap();
+ if (source != null) {
+ final Map<String, Object> docMap = new HashMap<>(source);
+ docMap.put(fessConfig.getIndexFieldId(), hit.getId());
+ docMap.put(fessConfig.getIndexFieldVersion(), hit.getVersion());
+ docMap.put(fessConfig.getIndexFieldSeqNo(), hit.getSeqNo());
+ docMap.put(fessConfig.getIndexFieldPrimaryTerm(), hit.getPrimaryTerm());
+ return docMap;
+ }
+ final Map<String, DocumentField> fields = hit.getFields();
+ if (fields != null) {
+ final Map<String, Object> docMap = fields.entrySet().stream()
+ .collect(Collectors.toMap(Entry<String, DocumentField>::getKey, e -> (Object) e.getValue().getValues()));
+ docMap.put(fessConfig.getIndexFieldId(), hit.getId());
+ docMap.put(fessConfig.getIndexFieldVersion(), hit.getVersion());
+ docMap.put(fessConfig.getIndexFieldSeqNo(), hit.getSeqNo());
+ docMap.put(fessConfig.getIndexFieldPrimaryTerm(), hit.getPrimaryTerm());
+ return docMap;
+ }
+ return null;
+ });
}
protected <T> OptionalEntity<T> getDocument(final String index, final SearchCondition<SearchRequestBuilder> condition,
@@ -894,30 +869,23 @@ public class FessEsClient implements Client {
}
public List<Map<String, Object>> getDocumentList(final String index, final SearchCondition<SearchRequestBuilder> condition) {
- return getDocumentList(
- index,
- condition,
- (response, hit) -> {
- final FessConfig fessConfig = ComponentUtil.getFessConfig();
- final Map<String, Object> source = hit.getSourceAsMap();
- if (source != null) {
- final Map<String, Object> docMap = new HashMap<>(source);
- docMap.put(fessConfig.getIndexFieldId(), hit.getId());
- return docMap;
- }
- final Map<String, DocumentField> fields = hit.getFields();
- if (fields != null) {
- final Map<String, Object> docMap =
- fields.entrySet()
- .stream()
- .collect(
- Collectors.toMap(Entry<String, DocumentField>::getKey, e -> (Object) e.getValue()
- .getValues()));
- docMap.put(fessConfig.getIndexFieldId(), hit.getId());
- return docMap;
- }
- return null;
- });
+ return getDocumentList(index, condition, (response, hit) -> {
+ final FessConfig fessConfig = ComponentUtil.getFessConfig();
+ final Map<String, Object> source = hit.getSourceAsMap();
+ if (source != null) {
+ final Map<String, Object> docMap = new HashMap<>(source);
+ docMap.put(fessConfig.getIndexFieldId(), hit.getId());
+ return docMap;
+ }
+ final Map<String, DocumentField> fields = hit.getFields();
+ if (fields != null) {
+ final Map<String, Object> docMap = fields.entrySet().stream()
+ .collect(Collectors.toMap(Entry<String, DocumentField>::getKey, e -> (Object) e.getValue().getValues()));
+ docMap.put(fessConfig.getIndexFieldId(), hit.getId());
+ return docMap;
+ }
+ return null;
+ });
}
protected <T> List<T> getDocumentList(final String index, final SearchCondition<SearchRequestBuilder> condition,
@@ -933,9 +901,8 @@ public class FessEsClient implements Client {
public boolean update(final String index, final String id, final String field, final Object value) {
try {
- final Result result =
- client.prepareUpdate().setIndex(index).setId(id).setDoc(field, value).execute()
- .actionGet(ComponentUtil.getFessConfig().getIndexIndexTimeout()).getResult();
+ final Result result = client.prepareUpdate().setIndex(index).setId(id).setDoc(field, value).execute()
+ .actionGet(ComponentUtil.getFessConfig().getIndexIndexTimeout()).getResult();
return result == Result.CREATED || result == Result.UPDATED;
} catch (final ElasticsearchException e) {
throw new FessEsClientException("Failed to set " + value + " to " + field + " for doc " + id, e);
@@ -1178,36 +1145,34 @@ public class FessEsClient implements Client {
}
protected void buildFacet(final QueryHelper queryHelper, final FessConfig fessConfig) {
- stream(facetInfo.field).of(
- stream -> stream.forEach(f -> {
- if (queryHelper.isFacetField(f)) {
- final String encodedField = BaseEncoding.base64().encode(f.getBytes(StandardCharsets.UTF_8));
- final TermsAggregationBuilder termsBuilder =
- AggregationBuilders.terms(Constants.FACET_FIELD_PREFIX + encodedField).field(f);
- termsBuilder.order(facetInfo.getBucketOrder());
- if (facetInfo.size != null) {
- termsBuilder.size(facetInfo.size);
- }
- if (facetInfo.minDocCount != null) {
- termsBuilder.minDocCount(facetInfo.minDocCount);
- }
- if (facetInfo.missing != null) {
- termsBuilder.missing(facetInfo.missing);
- }
- searchRequestBuilder.addAggregation(termsBuilder);
- } else {
- throw new SearchQueryException("Invalid facet field: " + f);
- }
- }));
- stream(facetInfo.query)
- .of(stream -> stream.forEach(fq -> {
- final QueryContext facetContext = new QueryContext(fq, false);
- queryHelper.buildBaseQuery(facetContext, c -> {});
- final String encodedFacetQuery = BaseEncoding.base64().encode(fq.getBytes(StandardCharsets.UTF_8));
- final FilterAggregationBuilder filterBuilder =
- AggregationBuilders.filter(Constants.FACET_QUERY_PREFIX + encodedFacetQuery, facetContext.getQueryBuilder());
- searchRequestBuilder.addAggregation(filterBuilder);
- }));
+ stream(facetInfo.field).of(stream -> stream.forEach(f -> {
+ if (queryHelper.isFacetField(f)) {
+ final String encodedField = BaseEncoding.base64().encode(f.getBytes(StandardCharsets.UTF_8));
+ final TermsAggregationBuilder termsBuilder =
+ AggregationBuilders.terms(Constants.FACET_FIELD_PREFIX + encodedField).field(f);
+ termsBuilder.order(facetInfo.getBucketOrder());
+ if (facetInfo.size != null) {
+ termsBuilder.size(facetInfo.size);
+ }
+ if (facetInfo.minDocCount != null) {
+ termsBuilder.minDocCount(facetInfo.minDocCount);
+ }
+ if (facetInfo.missing != null) {
+ termsBuilder.missing(facetInfo.missing);
+ }
+ searchRequestBuilder.addAggregation(termsBuilder);
+ } else {
+ throw new SearchQueryException("Invalid facet field: " + f);
+ }
+ }));
+ stream(facetInfo.query).of(stream -> stream.forEach(fq -> {
+ final QueryContext facetContext = new QueryContext(fq, false);
+ queryHelper.buildBaseQuery(facetContext, c -> {});
+ final String encodedFacetQuery = BaseEncoding.base64().encode(fq.getBytes(StandardCharsets.UTF_8));
+ final FilterAggregationBuilder filterBuilder =
+ AggregationBuilders.filter(Constants.FACET_QUERY_PREFIX + encodedFacetQuery, facetContext.getQueryBuilder());
+ searchRequestBuilder.addAggregation(filterBuilder);
+ }));
}
protected void buildHighlighter(final QueryHelper queryHelper, final FessConfig fessConfig) {
@@ -1225,8 +1190,8 @@ public class FessEsClient implements Client {
final int phraseLimit = fessConfig.getQueryHighlightPhraseLimitAsInteger();
final String encoder = fessConfig.getQueryHighlightEncoder();
final HighlightBuilder highlightBuilder = new HighlightBuilder();
- queryHelper.highlightedFields(stream -> stream.forEach(hf -> highlightBuilder.field(
- new HighlightBuilder.Field(hf).highlighterType(highlighterType).fragmentSize(fragmentSize)
+ queryHelper.highlightedFields(stream -> stream.forEach(hf -> highlightBuilder
+ .field(new HighlightBuilder.Field(hf).highlighterType(highlighterType).fragmentSize(fragmentSize)
.numOfFragments(numOfFragments).boundaryChars(boundaryChars).boundaryMaxScan(boundaryMaxScan)
.boundaryScannerType(boundaryScannerType).forceSource(forceSource).fragmenter(fragmenter)
.fragmentOffset(fragmentOffset).noMatchSize(noMatchSize).order(order).phraseLimit(phraseLimit))
@@ -1243,34 +1208,31 @@ public class FessEsClient implements Client {
}
protected QueryContext buildQueryContext(final QueryHelper queryHelper, final FessConfig fessConfig) {
- return queryHelper.build(
- searchRequestType,
- query,
- context -> {
- if (SearchRequestType.ADMIN_SEARCH.equals(searchRequestType)) {
- context.skipRoleQuery();
- } else if (similarDocHash != null) {
- final DocumentHelper documentHelper = ComponentUtil.getDocumentHelper();
- context.addQuery(boolQuery -> {
- boolQuery.filter(QueryBuilders.termQuery(fessConfig.getIndexFieldContentMinhashBits(),
- documentHelper.decodeSimilarDocHash(similarDocHash)));
- });
- }
-
- if (geoInfo != null && geoInfo.toQueryBuilder() != null) {
- context.addQuery(boolQuery -> boolQuery.filter(geoInfo.toQueryBuilder()));
- }
+ return queryHelper.build(searchRequestType, query, context -> {
+ if (SearchRequestType.ADMIN_SEARCH.equals(searchRequestType)) {
+ context.skipRoleQuery();
+ } else if (similarDocHash != null) {
+ final DocumentHelper documentHelper = ComponentUtil.getDocumentHelper();
+ context.addQuery(boolQuery -> {
+ boolQuery.filter(QueryBuilders.termQuery(fessConfig.getIndexFieldContentMinhashBits(),
+ documentHelper.decodeSimilarDocHash(similarDocHash)));
});
+ }
+
+ if (geoInfo != null && geoInfo.toQueryBuilder() != null) {
+ context.addQuery(boolQuery -> boolQuery.filter(geoInfo.toQueryBuilder()));
+ }
+ });
}
protected CollapseBuilder getCollapseBuilder(final FessConfig fessConfig) {
- final InnerHitBuilder innerHitBuilder =
- new InnerHitBuilder().setName(fessConfig.getQueryCollapseInnerHitsName()).setSize(
- fessConfig.getQueryCollapseInnerHitsSizeAsInteger());
- fessConfig.getQueryCollapseInnerHitsSortBuilders().ifPresent(
- builders -> stream(builders).of(stream -> stream.forEach(innerHitBuilder::addSort)));
- return new CollapseBuilder(fessConfig.getIndexFieldContentMinhashBits()).setMaxConcurrentGroupRequests(
- fessConfig.getQueryCollapseMaxConcurrentGroupResultsAsInteger()).setInnerHits(innerHitBuilder);
+ final InnerHitBuilder innerHitBuilder = new InnerHitBuilder().setName(fessConfig.getQueryCollapseInnerHitsName())
+ .setSize(fessConfig.getQueryCollapseInnerHitsSizeAsInteger());
+ fessConfig.getQueryCollapseInnerHitsSortBuilders()
+ .ifPresent(builders -> stream(builders).of(stream -> stream.forEach(innerHitBuilder::addSort)));
+ return new CollapseBuilder(fessConfig.getIndexFieldContentMinhashBits())
+ .setMaxConcurrentGroupRequests(fessConfig.getQueryCollapseMaxConcurrentGroupResultsAsInteger())
+ .setInnerHits(innerHitBuilder);
}
}
@@ -1287,14 +1249,12 @@ public class FessEsClient implements Client {
if (id == null) {
// TODO throw Exception in next release
// create
- response =
- client.prepareIndex().setIndex(index).setSource(new DocMap(source)).setRefreshPolicy(RefreshPolicy.IMMEDIATE)
- .setOpType(OpType.CREATE).execute().actionGet(fessConfig.getIndexIndexTimeout());
+ response = client.prepareIndex().setIndex(index).setSource(new DocMap(source)).setRefreshPolicy(RefreshPolicy.IMMEDIATE)
+ .setOpType(OpType.CREATE).execute().actionGet(fessConfig.getIndexIndexTimeout());
} else {
// create or update
- final IndexRequestBuilder builder =
- client.prepareIndex().setIndex(index).setId(id).setSource(new DocMap(source))
- .setRefreshPolicy(RefreshPolicy.IMMEDIATE).setOpType(OpType.INDEX);
+ final IndexRequestBuilder builder = client.prepareIndex().setIndex(index).setId(id).setSource(new DocMap(source))
+ .setRefreshPolicy(RefreshPolicy.IMMEDIATE).setOpType(OpType.INDEX);
if (seqNo != null) {
builder.setIfSeqNo(seqNo.longValue());
}
diff --git a/src/main/java/org/codelibs/fess/es/common/ImplementedInvokerAssistant.java b/src/main/java/org/codelibs/fess/es/common/ImplementedInvokerAssistant.java
index dd592800e..7eb472d43 100644
--- a/src/main/java/org/codelibs/fess/es/common/ImplementedInvokerAssistant.java
+++ b/src/main/java/org/codelibs/fess/es/common/ImplementedInvokerAssistant.java
@@ -41,11 +41,11 @@ public class ImplementedInvokerAssistant implements InvokerAssistant {
// ===================================================================================
// Attribute
// =========
- protected static final String[] DEFAULT_CLIENT_INVOKE_NAMES = new String[] { "Page", "Action", "Controller", "ControllerImpl", "Task",
- "Test" };
+ protected static final String[] DEFAULT_CLIENT_INVOKE_NAMES =
+ new String[] { "Page", "Action", "Controller", "ControllerImpl", "Task", "Test" };
- protected static final String[] DEFAULT_BYPASS_INVOKE_NAMES = new String[] { "Service", "ServiceImpl", "Facade", "FacadeImpl", "Logic",
- "LogicImpl" };
+ protected static final String[] DEFAULT_BYPASS_INVOKE_NAMES =
+ new String[] { "Service", "ServiceImpl", "Facade", "FacadeImpl", "Logic", "LogicImpl" };
@Override
public DBDef assistCurrentDBDef() {
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java
index 05adbffab..abd9a2261 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java
@@ -107,7 +107,8 @@ public abstract class BsRelatedContentBhv extends EsAbstractBehavior<RelatedCont
return doSelectOptionalEntity(cb, typeOfSelectedEntity());
}
- protected <ENTITY extends RelatedContent> OptionalEntity<ENTITY> doSelectOptionalEntity(RelatedContentCB cb, Class<? extends ENTITY> tp) {
+ protected <ENTITY extends RelatedContent> OptionalEntity<ENTITY> doSelectOptionalEntity(RelatedContentCB cb,
+ Class<? extends ENTITY> tp) {
return createOptionalEntity(doSelectEntity(cb, tp), cb);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java
index 1ca093eb2..20da14bac 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java
@@ -105,7 +105,8 @@ public abstract class BsThumbnailQueueBhv extends EsAbstractBehavior<ThumbnailQu
return doSelectOptionalEntity(cb, typeOfSelectedEntity());
}
- protected <ENTITY extends ThumbnailQueue> OptionalEntity<ENTITY> doSelectOptionalEntity(ThumbnailQueueCB cb, Class<? extends ENTITY> tp) {
+ protected <ENTITY extends ThumbnailQueue> OptionalEntity<ENTITY> doSelectOptionalEntity(ThumbnailQueueCB cb,
+ Class<? extends ENTITY> tp) {
return createOptionalEntity(doSelectEntity(cb, tp), cb);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/AccessTokenDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/AccessTokenDbm.java
index 67c697dbe..cfdc88f4d 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/AccessTokenDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/AccessTokenDbm.java
@@ -143,8 +143,8 @@ public class AccessTokenDbm extends AbstractDBMeta {
null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnToken = cci("token", "token", null, null, String.class, "token", null, false, false, false,
- "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnToken = cci("token", "token", null, null, String.class, "token", null, false, false, false, "keyword",
+ 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java
index 750519727..f5bf90450 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java
@@ -79,10 +79,10 @@ public class CrawlingInfoDbm extends AbstractDBMeta {
// ---------------
protected final Map<String, PropertyGateway> _epgMap = newHashMap();
{
- setupEpg(_epgMap, et -> ((CrawlingInfo) et).getCreatedTime(),
- (et, vl) -> ((CrawlingInfo) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
- setupEpg(_epgMap, et -> ((CrawlingInfo) et).getExpiredTime(),
- (et, vl) -> ((CrawlingInfo) et).setExpiredTime(DfTypeUtil.toLong(vl)), "expiredTime");
+ setupEpg(_epgMap, et -> ((CrawlingInfo) et).getCreatedTime(), (et, vl) -> ((CrawlingInfo) et).setCreatedTime(DfTypeUtil.toLong(vl)),
+ "createdTime");
+ setupEpg(_epgMap, et -> ((CrawlingInfo) et).getExpiredTime(), (et, vl) -> ((CrawlingInfo) et).setExpiredTime(DfTypeUtil.toLong(vl)),
+ "expiredTime");
setupEpg(_epgMap, et -> ((CrawlingInfo) et).getName(), (et, vl) -> ((CrawlingInfo) et).setName(DfTypeUtil.toString(vl)), "name");
setupEpg(_epgMap, et -> ((CrawlingInfo) et).getSessionId(), (et, vl) -> ((CrawlingInfo) et).setSessionId(DfTypeUtil.toString(vl)),
"sessionId");
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java
index f32c9a29b..18806c03f 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java
@@ -85,8 +85,8 @@ public class CrawlingInfoParamDbm extends AbstractDBMeta {
(et, vl) -> ((CrawlingInfoParam) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
setupEpg(_epgMap, et -> ((CrawlingInfoParam) et).getKey(), (et, vl) -> ((CrawlingInfoParam) et).setKey(DfTypeUtil.toString(vl)),
"key");
- setupEpg(_epgMap, et -> ((CrawlingInfoParam) et).getValue(),
- (et, vl) -> ((CrawlingInfoParam) et).setValue(DfTypeUtil.toString(vl)), "value");
+ setupEpg(_epgMap, et -> ((CrawlingInfoParam) et).getValue(), (et, vl) -> ((CrawlingInfoParam) et).setValue(DfTypeUtil.toString(vl)),
+ "value");
}
@Override
@@ -129,8 +129,8 @@ public class CrawlingInfoParamDbm extends AbstractDBMeta {
false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnKey = cci("key", "key", null, null, String.class, "key", null, false, false, false, "keyword", 0, 0,
null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false,
- "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "keyword",
+ 0, 0, null, null, false, null, null, null, null, null, false);
public ColumnInfo columnCrawlingInfoId() {
return _columnCrawlingInfoId;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java
index a5875c93f..fef66ce73 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java
@@ -143,8 +143,8 @@ public class DataConfigDbm extends AbstractDBMeta {
// ===========
protected final ColumnInfo _columnAvailable = cci("available", "available", null, null, Boolean.class, "available", null, false, false,
false, "Boolean", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float",
- 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", 0,
+ 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
@@ -155,8 +155,8 @@ public class DataConfigDbm extends AbstractDBMeta {
false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnHandlerParameter = cci("handlerParameter", "handlerParameter", null, null, String.class,
"handlerParameter", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnHandlerScript = cci("handlerScript", "handlerScript", null, null, String.class, "handlerScript",
- null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnHandlerScript = cci("handlerScript", "handlerScript", null, null, String.class, "handlerScript", null,
+ false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java
index 162569321..a718d870c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java
@@ -79,8 +79,8 @@ public class DuplicateHostDbm extends AbstractDBMeta {
// ---------------
protected final Map<String, PropertyGateway> _epgMap = newHashMap();
{
- setupEpg(_epgMap, et -> ((DuplicateHost) et).getCreatedBy(),
- (et, vl) -> ((DuplicateHost) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
+ setupEpg(_epgMap, et -> ((DuplicateHost) et).getCreatedBy(), (et, vl) -> ((DuplicateHost) et).setCreatedBy(DfTypeUtil.toString(vl)),
+ "createdBy");
setupEpg(_epgMap, et -> ((DuplicateHost) et).getCreatedTime(),
(et, vl) -> ((DuplicateHost) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
setupEpg(_epgMap, et -> ((DuplicateHost) et).getDuplicateHostName(),
@@ -89,8 +89,8 @@ public class DuplicateHostDbm extends AbstractDBMeta {
(et, vl) -> ((DuplicateHost) et).setRegularName(DfTypeUtil.toString(vl)), "regularName");
setupEpg(_epgMap, et -> ((DuplicateHost) et).getSortOrder(),
(et, vl) -> ((DuplicateHost) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder");
- setupEpg(_epgMap, et -> ((DuplicateHost) et).getUpdatedBy(),
- (et, vl) -> ((DuplicateHost) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy");
+ setupEpg(_epgMap, et -> ((DuplicateHost) et).getUpdatedBy(), (et, vl) -> ((DuplicateHost) et).setUpdatedBy(DfTypeUtil.toString(vl)),
+ "updatedBy");
setupEpg(_epgMap, et -> ((DuplicateHost) et).getUpdatedTime(),
(et, vl) -> ((DuplicateHost) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java
index d81cad10b..74aec4cac 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java
@@ -88,8 +88,8 @@ public class ElevateWordDbm extends AbstractDBMeta {
"permissions");
setupEpg(_epgMap, et -> ((ElevateWord) et).getReading(), (et, vl) -> ((ElevateWord) et).setReading(DfTypeUtil.toString(vl)),
"reading");
- setupEpg(_epgMap, et -> ((ElevateWord) et).getSuggestWord(),
- (et, vl) -> ((ElevateWord) et).setSuggestWord(DfTypeUtil.toString(vl)), "suggestWord");
+ setupEpg(_epgMap, et -> ((ElevateWord) et).getSuggestWord(), (et, vl) -> ((ElevateWord) et).setSuggestWord(DfTypeUtil.toString(vl)),
+ "suggestWord");
setupEpg(_epgMap, et -> ((ElevateWord) et).getUpdatedBy(), (et, vl) -> ((ElevateWord) et).setUpdatedBy(DfTypeUtil.toString(vl)),
"updatedBy");
setupEpg(_epgMap, et -> ((ElevateWord) et).getUpdatedTime(), (et, vl) -> ((ElevateWord) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
@@ -130,8 +130,8 @@ public class ElevateWordDbm extends AbstractDBMeta {
// ===================================================================================
// Column Info
// ===========
- protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float",
- 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", 0,
+ 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java
index 9dedee9e4..4747383f1 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java
@@ -119,8 +119,8 @@ public class ElevateWordToLabelDbm extends AbstractDBMeta {
// ===================================================================================
// Column Info
// ===========
- protected final ColumnInfo _columnElevateWordId = cci("elevateWordId", "elevateWordId", null, null, String.class, "elevateWordId",
- null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnElevateWordId = cci("elevateWordId", "elevateWordId", null, null, String.class, "elevateWordId", null,
+ false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false,
false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java
index d389dceab..f7e208866 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java
@@ -149,8 +149,8 @@ public class FileAuthenticationDbm extends AbstractDBMeta {
false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false,
false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnPort = cci("port", "port", null, null, Integer.class, "port", null, false, false, false, "Integer",
- 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnPort = cci("port", "port", null, null, Integer.class, "port", null, false, false, false, "Integer", 0,
+ 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnProtocolScheme = cci("protocolScheme", "protocolScheme", null, null, String.class, "protocolScheme",
null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java
index b9661cf70..8574dfa4a 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java
@@ -157,8 +157,8 @@ public class FileConfigDbm extends AbstractDBMeta {
// ===========
protected final ColumnInfo _columnAvailable = cci("available", "available", null, null, Boolean.class, "available", null, false, false,
false, "Boolean", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float",
- 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", 0,
+ 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnConfigParameter = cci("configParameter", "configParameter", null, null, String.class,
"configParameter", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
@@ -171,22 +171,22 @@ public class FileConfigDbm extends AbstractDBMeta {
false, false, "text", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnExcludedDocPaths = cci("excludedDocPaths", "excludedDocPaths", null, null, String.class,
"excludedDocPaths", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnExcludedPaths = cci("excludedPaths", "excludedPaths", null, null, String.class, "excludedPaths",
- null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnExcludedPaths = cci("excludedPaths", "excludedPaths", null, null, String.class, "excludedPaths", null,
+ false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnIncludedDocPaths = cci("includedDocPaths", "includedDocPaths", null, null, String.class,
"includedDocPaths", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnIncludedPaths = cci("includedPaths", "includedPaths", null, null, String.class, "includedPaths",
- null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnIncludedPaths = cci("includedPaths", "includedPaths", null, null, String.class, "includedPaths", null,
+ false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnIntervalTime = cci("intervalTime", "intervalTime", null, null, Integer.class, "intervalTime", null,
false, false, false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnMaxAccessCount = cci("maxAccessCount", "maxAccessCount", null, null, Long.class, "maxAccessCount",
null, false, false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnNumOfThread = cci("numOfThread", "numOfThread", null, null, Integer.class, "numOfThread", null,
- false, false, false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnPaths = cci("paths", "paths", null, null, String.class, "paths", null, false, false, false,
- "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnNumOfThread = cci("numOfThread", "numOfThread", null, null, Integer.class, "numOfThread", null, false,
+ false, false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnPaths = cci("paths", "paths", null, null, String.class, "paths", null, false, false, false, "keyword",
+ 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java
index 2a505b7c4..b4934a8d4 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java
@@ -129,16 +129,16 @@ public class KeyMatchDbm extends AbstractDBMeta {
// ===================================================================================
// Column Info
// ===========
- protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float",
- 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", 0,
+ 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnMaxSize = cci("maxSize", "maxSize", null, null, Integer.class, "maxSize", null, false, false, false,
"Integer", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnQuery = cci("query", "query", null, null, String.class, "query", null, false, false, false,
- "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnQuery = cci("query", "query", null, null, String.class, "query", null, false, false, false, "keyword",
+ 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnTerm = cci("term", "term", null, null, String.class, "term", null, false, false, false, "keyword", 0,
0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java
index e22e2d9b5..87c77d1b6 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java
@@ -83,10 +83,10 @@ public class LabelTypeDbm extends AbstractDBMeta {
"createdBy");
setupEpg(_epgMap, et -> ((LabelType) et).getCreatedTime(), (et, vl) -> ((LabelType) et).setCreatedTime(DfTypeUtil.toLong(vl)),
"createdTime");
- setupEpg(_epgMap, et -> ((LabelType) et).getExcludedPaths(),
- (et, vl) -> ((LabelType) et).setExcludedPaths(DfTypeUtil.toString(vl)), "excludedPaths");
- setupEpg(_epgMap, et -> ((LabelType) et).getIncludedPaths(),
- (et, vl) -> ((LabelType) et).setIncludedPaths(DfTypeUtil.toString(vl)), "includedPaths");
+ setupEpg(_epgMap, et -> ((LabelType) et).getExcludedPaths(), (et, vl) -> ((LabelType) et).setExcludedPaths(DfTypeUtil.toString(vl)),
+ "excludedPaths");
+ setupEpg(_epgMap, et -> ((LabelType) et).getIncludedPaths(), (et, vl) -> ((LabelType) et).setIncludedPaths(DfTypeUtil.toString(vl)),
+ "includedPaths");
setupEpg(_epgMap, et -> ((LabelType) et).getName(), (et, vl) -> ((LabelType) et).setName(DfTypeUtil.toString(vl)), "name");
setupEpg(_epgMap, et -> ((LabelType) et).getPermissions(), (et, vl) -> ((LabelType) et).setPermissions((String[]) vl),
"permissions");
@@ -139,10 +139,10 @@ public class LabelTypeDbm extends AbstractDBMeta {
false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnExcludedPaths = cci("excludedPaths", "excludedPaths", null, null, String.class, "excludedPaths",
- null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnIncludedPaths = cci("includedPaths", "includedPaths", null, null, String.class, "includedPaths",
- null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnExcludedPaths = cci("excludedPaths", "excludedPaths", null, null, String.class, "excludedPaths", null,
+ false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnIncludedPaths = cci("includedPaths", "includedPaths", null, null, String.class, "includedPaths", null,
+ false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
@@ -153,8 +153,8 @@ public class LabelTypeDbm extends AbstractDBMeta {
false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false,
- "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "keyword",
+ 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnVirtualHost = cci("virtualHost", "virtualHost", null, null, String.class, "virtualHost", null, false,
false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java
index 35ff59b1f..3926f623a 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java
@@ -83,11 +83,11 @@ public class PathMappingDbm extends AbstractDBMeta {
"createdBy");
setupEpg(_epgMap, et -> ((PathMapping) et).getCreatedTime(), (et, vl) -> ((PathMapping) et).setCreatedTime(DfTypeUtil.toLong(vl)),
"createdTime");
- setupEpg(_epgMap, et -> ((PathMapping) et).getProcessType(),
- (et, vl) -> ((PathMapping) et).setProcessType(DfTypeUtil.toString(vl)), "processType");
+ setupEpg(_epgMap, et -> ((PathMapping) et).getProcessType(), (et, vl) -> ((PathMapping) et).setProcessType(DfTypeUtil.toString(vl)),
+ "processType");
setupEpg(_epgMap, et -> ((PathMapping) et).getRegex(), (et, vl) -> ((PathMapping) et).setRegex(DfTypeUtil.toString(vl)), "regex");
- setupEpg(_epgMap, et -> ((PathMapping) et).getReplacement(),
- (et, vl) -> ((PathMapping) et).setReplacement(DfTypeUtil.toString(vl)), "replacement");
+ setupEpg(_epgMap, et -> ((PathMapping) et).getReplacement(), (et, vl) -> ((PathMapping) et).setReplacement(DfTypeUtil.toString(vl)),
+ "replacement");
setupEpg(_epgMap, et -> ((PathMapping) et).getSortOrder(), (et, vl) -> ((PathMapping) et).setSortOrder(DfTypeUtil.toInteger(vl)),
"sortOrder");
setupEpg(_epgMap, et -> ((PathMapping) et).getUpdatedBy(), (et, vl) -> ((PathMapping) et).setUpdatedBy(DfTypeUtil.toString(vl)),
@@ -138,8 +138,8 @@ public class PathMappingDbm extends AbstractDBMeta {
false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnProcessType = cci("processType", "processType", null, null, String.class, "processType", null, false,
false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnRegex = cci("regex", "regex", null, null, String.class, "regex", null, false, false, false,
- "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnRegex = cci("regex", "regex", null, null, String.class, "regex", null, false, false, false, "keyword",
+ 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnReplacement = cci("replacement", "replacement", null, null, String.class, "replacement", null, false,
false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedContentDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedContentDbm.java
index e9979be35..0dd24db5e 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedContentDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedContentDbm.java
@@ -87,7 +87,8 @@ public class RelatedContentDbm extends AbstractDBMeta {
(et, vl) -> ((RelatedContent) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
setupEpg(_epgMap, et -> ((RelatedContent) et).getSortOrder(),
(et, vl) -> ((RelatedContent) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder");
- setupEpg(_epgMap, et -> ((RelatedContent) et).getTerm(), (et, vl) -> ((RelatedContent) et).setTerm(DfTypeUtil.toString(vl)), "term");
+ setupEpg(_epgMap, et -> ((RelatedContent) et).getTerm(), (et, vl) -> ((RelatedContent) et).setTerm(DfTypeUtil.toString(vl)),
+ "term");
setupEpg(_epgMap, et -> ((RelatedContent) et).getUpdatedBy(),
(et, vl) -> ((RelatedContent) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy");
setupEpg(_epgMap, et -> ((RelatedContent) et).getUpdatedTime(),
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedQueryDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedQueryDbm.java
index def210e8f..a1106ed5a 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedQueryDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedQueryDbm.java
@@ -81,14 +81,14 @@ public class RelatedQueryDbm extends AbstractDBMeta {
{
setupEpg(_epgMap, et -> ((RelatedQuery) et).getCreatedBy(), (et, vl) -> ((RelatedQuery) et).setCreatedBy(DfTypeUtil.toString(vl)),
"createdBy");
- setupEpg(_epgMap, et -> ((RelatedQuery) et).getCreatedTime(),
- (et, vl) -> ((RelatedQuery) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
+ setupEpg(_epgMap, et -> ((RelatedQuery) et).getCreatedTime(), (et, vl) -> ((RelatedQuery) et).setCreatedTime(DfTypeUtil.toLong(vl)),
+ "createdTime");
setupEpg(_epgMap, et -> ((RelatedQuery) et).getQueries(), (et, vl) -> ((RelatedQuery) et).setQueries((String[]) vl), "queries");
setupEpg(_epgMap, et -> ((RelatedQuery) et).getTerm(), (et, vl) -> ((RelatedQuery) et).setTerm(DfTypeUtil.toString(vl)), "term");
setupEpg(_epgMap, et -> ((RelatedQuery) et).getUpdatedBy(), (et, vl) -> ((RelatedQuery) et).setUpdatedBy(DfTypeUtil.toString(vl)),
"updatedBy");
- setupEpg(_epgMap, et -> ((RelatedQuery) et).getUpdatedTime(),
- (et, vl) -> ((RelatedQuery) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
+ setupEpg(_epgMap, et -> ((RelatedQuery) et).getUpdatedTime(), (et, vl) -> ((RelatedQuery) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
+ "updatedTime");
setupEpg(_epgMap, et -> ((RelatedQuery) et).getVirtualHost(),
(et, vl) -> ((RelatedQuery) et).setVirtualHost(DfTypeUtil.toString(vl)), "virtualHost");
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java
index 154f903cf..54c6c60eb 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java
@@ -79,13 +79,13 @@ public class RequestHeaderDbm extends AbstractDBMeta {
// ---------------
protected final Map<String, PropertyGateway> _epgMap = newHashMap();
{
- setupEpg(_epgMap, et -> ((RequestHeader) et).getCreatedBy(),
- (et, vl) -> ((RequestHeader) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
+ setupEpg(_epgMap, et -> ((RequestHeader) et).getCreatedBy(), (et, vl) -> ((RequestHeader) et).setCreatedBy(DfTypeUtil.toString(vl)),
+ "createdBy");
setupEpg(_epgMap, et -> ((RequestHeader) et).getCreatedTime(),
(et, vl) -> ((RequestHeader) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
setupEpg(_epgMap, et -> ((RequestHeader) et).getName(), (et, vl) -> ((RequestHeader) et).setName(DfTypeUtil.toString(vl)), "name");
- setupEpg(_epgMap, et -> ((RequestHeader) et).getUpdatedBy(),
- (et, vl) -> ((RequestHeader) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy");
+ setupEpg(_epgMap, et -> ((RequestHeader) et).getUpdatedBy(), (et, vl) -> ((RequestHeader) et).setUpdatedBy(DfTypeUtil.toString(vl)),
+ "updatedBy");
setupEpg(_epgMap, et -> ((RequestHeader) et).getUpdatedTime(),
(et, vl) -> ((RequestHeader) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
setupEpg(_epgMap, et -> ((RequestHeader) et).getValue(), (et, vl) -> ((RequestHeader) et).setValue(DfTypeUtil.toString(vl)),
@@ -138,8 +138,8 @@ public class RequestHeaderDbm extends AbstractDBMeta {
false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false,
- "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "keyword",
+ 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false,
false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java
index 404489f12..c460a1272 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java
@@ -139,8 +139,8 @@ public class RoleTypeDbm extends AbstractDBMeta {
false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false,
- "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "keyword",
+ 0, 0, null, null, false, null, null, null, null, null, false);
public ColumnInfo columnCreatedBy() {
return _columnCreatedBy;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java
index f23f20865..a6349f729 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java
@@ -85,25 +85,25 @@ public class ScheduledJobDbm extends AbstractDBMeta {
"crawler");
setupEpg(_epgMap, et -> ((ScheduledJob) et).getCreatedBy(), (et, vl) -> ((ScheduledJob) et).setCreatedBy(DfTypeUtil.toString(vl)),
"createdBy");
- setupEpg(_epgMap, et -> ((ScheduledJob) et).getCreatedTime(),
- (et, vl) -> ((ScheduledJob) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
+ setupEpg(_epgMap, et -> ((ScheduledJob) et).getCreatedTime(), (et, vl) -> ((ScheduledJob) et).setCreatedTime(DfTypeUtil.toLong(vl)),
+ "createdTime");
setupEpg(_epgMap, et -> ((ScheduledJob) et).getCronExpression(),
(et, vl) -> ((ScheduledJob) et).setCronExpression(DfTypeUtil.toString(vl)), "cronExpression");
setupEpg(_epgMap, et -> ((ScheduledJob) et).getJobLogging(),
(et, vl) -> ((ScheduledJob) et).setJobLogging(DfTypeUtil.toBoolean(vl)), "jobLogging");
setupEpg(_epgMap, et -> ((ScheduledJob) et).getName(), (et, vl) -> ((ScheduledJob) et).setName(DfTypeUtil.toString(vl)), "name");
- setupEpg(_epgMap, et -> ((ScheduledJob) et).getScriptData(),
- (et, vl) -> ((ScheduledJob) et).setScriptData(DfTypeUtil.toString(vl)), "scriptData");
- setupEpg(_epgMap, et -> ((ScheduledJob) et).getScriptType(),
- (et, vl) -> ((ScheduledJob) et).setScriptType(DfTypeUtil.toString(vl)), "scriptType");
+ setupEpg(_epgMap, et -> ((ScheduledJob) et).getScriptData(), (et, vl) -> ((ScheduledJob) et).setScriptData(DfTypeUtil.toString(vl)),
+ "scriptData");
+ setupEpg(_epgMap, et -> ((ScheduledJob) et).getScriptType(), (et, vl) -> ((ScheduledJob) et).setScriptType(DfTypeUtil.toString(vl)),
+ "scriptType");
setupEpg(_epgMap, et -> ((ScheduledJob) et).getSortOrder(), (et, vl) -> ((ScheduledJob) et).setSortOrder(DfTypeUtil.toInteger(vl)),
"sortOrder");
setupEpg(_epgMap, et -> ((ScheduledJob) et).getTarget(), (et, vl) -> ((ScheduledJob) et).setTarget(DfTypeUtil.toString(vl)),
"target");
setupEpg(_epgMap, et -> ((ScheduledJob) et).getUpdatedBy(), (et, vl) -> ((ScheduledJob) et).setUpdatedBy(DfTypeUtil.toString(vl)),
"updatedBy");
- setupEpg(_epgMap, et -> ((ScheduledJob) et).getUpdatedTime(),
- (et, vl) -> ((ScheduledJob) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
+ setupEpg(_epgMap, et -> ((ScheduledJob) et).getUpdatedTime(), (et, vl) -> ((ScheduledJob) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
+ "updatedTime");
}
@Override
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ThumbnailQueueDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ThumbnailQueueDbm.java
index 4ec8d6554..cda3237ae 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ThumbnailQueueDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ThumbnailQueueDbm.java
@@ -85,7 +85,8 @@ public class ThumbnailQueueDbm extends AbstractDBMeta {
(et, vl) -> ((ThumbnailQueue) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
setupEpg(_epgMap, et -> ((ThumbnailQueue) et).getGenerator(),
(et, vl) -> ((ThumbnailQueue) et).setGenerator(DfTypeUtil.toString(vl)), "generator");
- setupEpg(_epgMap, et -> ((ThumbnailQueue) et).getPath(), (et, vl) -> ((ThumbnailQueue) et).setPath(DfTypeUtil.toString(vl)), "path");
+ setupEpg(_epgMap, et -> ((ThumbnailQueue) et).getPath(), (et, vl) -> ((ThumbnailQueue) et).setPath(DfTypeUtil.toString(vl)),
+ "path");
setupEpg(_epgMap, et -> ((ThumbnailQueue) et).getTarget(), (et, vl) -> ((ThumbnailQueue) et).setTarget(DfTypeUtil.toString(vl)),
"target");
setupEpg(_epgMap, et -> ((ThumbnailQueue) et).getThumbnailId(),
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java
index 00b7df3bf..b22df34f7 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java
@@ -151,8 +151,8 @@ public class WebAuthenticationDbm extends AbstractDBMeta {
false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false,
false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnPort = cci("port", "port", null, null, Integer.class, "port", null, false, false, false, "Integer",
- 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnPort = cci("port", "port", null, null, Integer.class, "port", null, false, false, false, "Integer", 0,
+ 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnProtocolScheme = cci("protocolScheme", "protocolScheme", null, null, String.class, "protocolScheme",
null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java
index f4fe940d1..c352c8516 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java
@@ -101,8 +101,8 @@ public class WebConfigDbm extends AbstractDBMeta {
"includedUrls");
setupEpg(_epgMap, et -> ((WebConfig) et).getIntervalTime(), (et, vl) -> ((WebConfig) et).setIntervalTime(DfTypeUtil.toInteger(vl)),
"intervalTime");
- setupEpg(_epgMap, et -> ((WebConfig) et).getMaxAccessCount(),
- (et, vl) -> ((WebConfig) et).setMaxAccessCount(DfTypeUtil.toLong(vl)), "maxAccessCount");
+ setupEpg(_epgMap, et -> ((WebConfig) et).getMaxAccessCount(), (et, vl) -> ((WebConfig) et).setMaxAccessCount(DfTypeUtil.toLong(vl)),
+ "maxAccessCount");
setupEpg(_epgMap, et -> ((WebConfig) et).getName(), (et, vl) -> ((WebConfig) et).setName(DfTypeUtil.toString(vl)), "name");
setupEpg(_epgMap, et -> ((WebConfig) et).getNumOfThread(), (et, vl) -> ((WebConfig) et).setNumOfThread(DfTypeUtil.toInteger(vl)),
"numOfThread");
@@ -159,8 +159,8 @@ public class WebConfigDbm extends AbstractDBMeta {
// ===========
protected final ColumnInfo _columnAvailable = cci("available", "available", null, null, Boolean.class, "available", null, false, false,
false, "Boolean", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float",
- 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", 0,
+ 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnConfigParameter = cci("configParameter", "configParameter", null, null, String.class,
"configParameter", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
@@ -185,8 +185,8 @@ public class WebConfigDbm extends AbstractDBMeta {
null, false, false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnNumOfThread = cci("numOfThread", "numOfThread", null, null, Integer.class, "numOfThread", null,
- false, false, false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnNumOfThread = cci("numOfThread", "numOfThread", null, null, Integer.class, "numOfThread", null, false,
+ false, false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java
index fe2a03639..261a96bc7 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java
@@ -350,7 +350,8 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
setCreatedTime_PercentileRanks("createdTime", values, opLambda);
}
- public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setCreatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -365,7 +366,8 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
setCreatedTime_Histogram("createdTime", opLambda, null);
}
- public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+ public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsAccessTokenCA> aggsLambda) {
setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
}
@@ -575,7 +577,8 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
setExpiredTime_PercentileRanks("expiredTime", values, opLambda);
}
- public void setExpiredTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setExpiredTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "expiredTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -590,7 +593,8 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
setExpiredTime_Histogram("expiredTime", opLambda, null);
}
- public void setExpiredTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+ public void setExpiredTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsAccessTokenCA> aggsLambda) {
setExpiredTime_Histogram("expiredTime", opLambda, aggsLambda);
}
@@ -699,7 +703,8 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
setName_Terms("name", opLambda, aggsLambda);
}
- public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+ public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsAccessTokenCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "name");
if (opLambda != null) {
opLambda.callback(builder);
@@ -876,7 +881,8 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
setParameterName_IpRange("parameter_name", opLambda, null);
}
- public void setParameterName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+ public void setParameterName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsAccessTokenCA> aggsLambda) {
setParameterName_IpRange("parameter_name", opLambda, aggsLambda);
}
@@ -931,7 +937,8 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
setParameterName_Missing("parameter_name", opLambda, null);
}
- public void setParameterName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+ public void setParameterName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsAccessTokenCA> aggsLambda) {
setParameterName_Missing("parameter_name", opLambda, aggsLambda);
}
@@ -1091,7 +1098,8 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
setToken_Terms("token", opLambda, aggsLambda);
}
- public void setToken_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+ public void setToken_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsAccessTokenCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "token");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1453,7 +1461,8 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
}
- public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setUpdatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -1468,7 +1477,8 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
setUpdatedTime_Histogram("updatedTime", opLambda, null);
}
- public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+ public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsAccessTokenCA> aggsLambda) {
setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java
index 2c997b7fc..066f7cf80 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java
@@ -118,7 +118,8 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
}
- public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+ public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsBadWordCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "createdBy");
if (opLambda != null) {
opLambda.callback(builder);
@@ -349,7 +350,8 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
setCreatedTime_PercentileRanks("createdTime", values, opLambda);
}
- public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setCreatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -735,7 +737,8 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
setTargetRole_Terms("targetRole", opLambda, aggsLambda);
}
- public void setTargetRole_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+ public void setTargetRole_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsBadWordCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "targetRole");
if (opLambda != null) {
opLambda.callback(builder);
@@ -865,7 +868,8 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
}
- public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+ public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsBadWordCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1096,7 +1100,8 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
}
- public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setUpdatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
if (opLambda != null) {
opLambda.callback(builder);
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
index bd6b76347..a843ddbc6 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
@@ -68,7 +68,8 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
}
}
- public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+ public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda,
+ OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
GlobalAggregationBuilder builder = regGlobalA(name);
if (opLambda != null) {
opLambda.callback(builder);
@@ -80,7 +81,8 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
}
}
- public void sampler(String name, ConditionOptionCall<SamplerAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+ public void sampler(String name, ConditionOptionCall<SamplerAggregationBuilder> opLambda,
+ OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
SamplerAggregationBuilder builder = regSamplerA(name);
if (opLambda != null) {
opLambda.callback(builder);
@@ -165,7 +167,8 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
setBoostExpr_IpRange("boostExpr", opLambda, null);
}
- public void setBoostExpr_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+ public void setBoostExpr_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
setBoostExpr_IpRange("boostExpr", opLambda, aggsLambda);
}
@@ -220,7 +223,8 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
setBoostExpr_Missing("boostExpr", opLambda, null);
}
- public void setBoostExpr_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+ public void setBoostExpr_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
setBoostExpr_Missing("boostExpr", opLambda, aggsLambda);
}
@@ -296,7 +300,8 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
setCreatedBy_IpRange("createdBy", opLambda, null);
}
- public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+ public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
setCreatedBy_IpRange("createdBy", opLambda, aggsLambda);
}
@@ -351,7 +356,8 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
setCreatedBy_Missing("createdBy", opLambda, null);
}
- public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+ public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
setCreatedBy_Missing("createdBy", opLambda, aggsLambda);
}
@@ -481,7 +487,8 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
setCreatedTime_PercentileRanks("createdTime", values, opLambda);
}
- public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setCreatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -522,7 +529,8 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
setCreatedTime_Range("createdTime", opLambda, null);
}
- public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+ public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda,
+ OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
setCreatedTime_Range("createdTime", opLambda, aggsLambda);
}
@@ -708,7 +716,8 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
setSortOrder_PercentileRanks("sortOrder", values, opLambda);
}
- public void setSortOrder_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setSortOrder_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -804,7 +813,8 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
setSortOrder_Missing("sortOrder", opLambda, null);
}
- public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+ public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
setSortOrder_Missing("sortOrder", opLambda, aggsLambda);
}
@@ -880,7 +890,8 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
setUpdatedBy_IpRange("updatedBy", opLambda, null);
}
- public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+ public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
setUpdatedBy_IpRange("updatedBy", opLambda, aggsLambda);
}
@@ -935,7 +946,8 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
setUpdatedBy_Missing("updatedBy", opLambda, null);
}
- public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+ public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
setUpdatedBy_Missing("updatedBy", opLambda, aggsLambda);
}
@@ -1065,7 +1077,8 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
}
- public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setUpdatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -1106,7 +1119,8 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
setUpdatedTime_Range("updatedTime", opLambda, null);
}
- public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+ public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda,
+ OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
}
@@ -1238,7 +1252,8 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
setUrlExpr_IpRange("urlExpr", opLambda, null);
}
- public void setUrlExpr_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+ public void setUrlExpr_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
setUrlExpr_IpRange("urlExpr", opLambda, aggsLambda);
}
@@ -1293,7 +1308,8 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
setUrlExpr_Missing("urlExpr", opLambda, null);
}
- public void setUrlExpr_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+ public void setUrlExpr_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
setUrlExpr_Missing("urlExpr", opLambda, aggsLambda);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java
index a07259865..0765391ad 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java
@@ -219,7 +219,8 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
setCreatedTime_PercentileRanks("createdTime", values, opLambda);
}
- public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setCreatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -445,7 +446,8 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
setExpiredTime_PercentileRanks("expiredTime", values, opLambda);
}
- public void setExpiredTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setExpiredTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "expiredTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -570,7 +572,8 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
setName_Terms("name", opLambda, aggsLambda);
}
- public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+ public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsCrawlingInfoCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "name");
if (opLambda != null) {
opLambda.callback(builder);
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
index 56edb7fdf..84dbd8c54 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
@@ -68,7 +68,8 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
}
}
- public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+ public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda,
+ OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
GlobalAggregationBuilder builder = regGlobalA(name);
if (opLambda != null) {
opLambda.callback(builder);
@@ -80,7 +81,8 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
}
}
- public void sampler(String name, ConditionOptionCall<SamplerAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+ public void sampler(String name, ConditionOptionCall<SamplerAggregationBuilder> opLambda,
+ OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
SamplerAggregationBuilder builder = regSamplerA(name);
if (opLambda != null) {
opLambda.callback(builder);
@@ -353,7 +355,8 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
setCreatedTime_PercentileRanks("createdTime", values, opLambda);
}
- public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setCreatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -394,7 +397,8 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
setCreatedTime_Range("createdTime", opLambda, null);
}
- public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+ public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda,
+ OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
setCreatedTime_Range("createdTime", opLambda, aggsLambda);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
index c7cc1fae2..b0ef16960 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
@@ -219,7 +219,8 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
setAvailable_PercentileRanks("available", values, opLambda);
}
- public void setAvailable_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setAvailable_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "available", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -488,7 +489,8 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
setBoost_Range("boost", opLambda, aggsLambda);
}
- public void setBoost_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+ public void setBoost_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+ OperatorCall<BsDataConfigCA> aggsLambda) {
RangeAggregationBuilder builder = regRangeA(name, "boost");
if (opLambda != null) {
opLambda.callback(builder);
@@ -799,7 +801,8 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
setCreatedTime_PercentileRanks("createdTime", values, opLambda);
}
- public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setCreatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -814,7 +817,8 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
setCreatedTime_Histogram("createdTime", opLambda, null);
}
- public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+ public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsDataConfigCA> aggsLambda) {
setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
}
@@ -1156,7 +1160,8 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
setHandlerParameter_IpRange("handlerParameter", opLambda, null);
}
- public void setHandlerParameter_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+ public void setHandlerParameter_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsDataConfigCA> aggsLambda) {
setHandlerParameter_IpRange("handlerParameter", opLambda, aggsLambda);
}
@@ -1211,7 +1216,8 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
setHandlerParameter_Missing("handlerParameter", opLambda, null);
}
- public void setHandlerParameter_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+ public void setHandlerParameter_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsDataConfigCA> aggsLambda) {
setHandlerParameter_Missing("handlerParameter", opLambda, aggsLambda);
}
@@ -1733,7 +1739,8 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
setSortOrder_PercentileRanks("sortOrder", values, opLambda);
}
- public void setSortOrder_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setSortOrder_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -2089,7 +2096,8 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
}
- public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setUpdatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -2104,7 +2112,8 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
setUpdatedTime_Histogram("updatedTime", opLambda, null);
}
- public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+ public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsDataConfigCA> aggsLambda) {
setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java
index 1b721fa9d..8da93deef 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java
@@ -350,7 +350,8 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
setCreatedTime_PercentileRanks("createdTime", values, opLambda);
}
- public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setCreatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -446,7 +447,8 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
setCreatedTime_Missing("createdTime", opLambda, null);
}
- public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+ public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsDuplicateHostCA> aggsLambda) {
setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
}
@@ -471,7 +473,8 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
setDuplicateHostName_Terms("duplicateHostName", opLambda, null);
}
- public void setDuplicateHostName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+ public void setDuplicateHostName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsDuplicateHostCA> aggsLambda) {
setDuplicateHostName_Terms("duplicateHostName", opLambda, aggsLambda);
}
@@ -655,7 +658,8 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
setRegularName_IpRange("regularName", opLambda, null);
}
- public void setRegularName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+ public void setRegularName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsDuplicateHostCA> aggsLambda) {
setRegularName_IpRange("regularName", opLambda, aggsLambda);
}
@@ -710,7 +714,8 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
setRegularName_Missing("regularName", opLambda, null);
}
- public void setRegularName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+ public void setRegularName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsDuplicateHostCA> aggsLambda) {
setRegularName_Missing("regularName", opLambda, aggsLambda);
}
@@ -840,7 +845,8 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
setSortOrder_PercentileRanks("sortOrder", values, opLambda);
}
- public void setSortOrder_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setSortOrder_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -855,7 +861,8 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
setSortOrder_Histogram("sortOrder", opLambda, null);
}
- public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+ public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsDuplicateHostCA> aggsLambda) {
setSortOrder_Histogram("sortOrder", opLambda, aggsLambda);
}
@@ -1196,7 +1203,8 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
}
- public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setUpdatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -1292,7 +1300,8 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
setUpdatedTime_Missing("updatedTime", opLambda, null);
}
- public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+ public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsDuplicateHostCA> aggsLambda) {
setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java
index d154a46f2..9ce996682 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java
@@ -263,7 +263,8 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
setBoost_Range("boost", opLambda, aggsLambda);
}
- public void setBoost_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+ public void setBoost_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+ OperatorCall<BsElevateWordCA> aggsLambda) {
RangeAggregationBuilder builder = regRangeA(name, "boost");
if (opLambda != null) {
opLambda.callback(builder);
@@ -574,7 +575,8 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
setCreatedTime_PercentileRanks("createdTime", values, opLambda);
}
- public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setCreatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -589,7 +591,8 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
setCreatedTime_Histogram("createdTime", opLambda, null);
}
- public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+ public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsElevateWordCA> aggsLambda) {
setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
}
@@ -1323,7 +1326,8 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
}
- public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setUpdatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -1338,7 +1342,8 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
setUpdatedTime_Histogram("updatedTime", opLambda, null);
}
- public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+ public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsElevateWordCA> aggsLambda) {
setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java
index d3243e022..42fce158a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java
@@ -58,7 +58,8 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
}
}
- public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
+ public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda,
+ OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
GlobalAggregationBuilder builder = regGlobalA(name);
if (opLambda != null) {
opLambda.callback(builder);
@@ -239,7 +240,8 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
setLabelTypeId_Terms("labelTypeId", opLambda, null);
}
- public void setLabelTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
+ public void setLabelTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
setLabelTypeId_Terms("labelTypeId", opLambda, aggsLambda);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java
index 737dfa812..19a2d0c15 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java
@@ -350,7 +350,8 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
setErrorCount_PercentileRanks("errorCount", values, opLambda);
}
- public void setErrorCount_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setErrorCount_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "errorCount", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -365,7 +366,8 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
setErrorCount_Histogram("errorCount", opLambda, null);
}
- public void setErrorCount_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+ public void setErrorCount_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsFailureUrlCA> aggsLambda) {
setErrorCount_Histogram("errorCount", opLambda, aggsLambda);
}
@@ -934,7 +936,8 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
setLastAccessTime_Missing("lastAccessTime", opLambda, null);
}
- public void setLastAccessTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+ public void setLastAccessTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsFailureUrlCA> aggsLambda) {
setLastAccessTime_Missing("lastAccessTime", opLambda, aggsLambda);
}
@@ -1144,7 +1147,8 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
setUrl_IpRange("url", opLambda, aggsLambda);
}
- public void setUrl_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+ public void setUrl_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsFailureUrlCA> aggsLambda) {
IpRangeAggregationBuilder builder = regIpRangeA(name, "url");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1198,7 +1202,8 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
setUrl_Missing("url", opLambda, aggsLambda);
}
- public void setUrl_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+ public void setUrl_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsFailureUrlCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "url");
if (opLambda != null) {
opLambda.callback(builder);
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java
index 40c8022f4..38fb05055 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java
@@ -68,7 +68,8 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
}
}
- public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+ public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda,
+ OperatorCall<BsFileAuthenticationCA> aggsLambda) {
GlobalAggregationBuilder builder = regGlobalA(name);
if (opLambda != null) {
opLambda.callback(builder);
@@ -353,7 +354,8 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
setCreatedTime_PercentileRanks("createdTime", values, opLambda);
}
- public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setCreatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -394,7 +396,8 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
setCreatedTime_Range("createdTime", opLambda, null);
}
- public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+ public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda,
+ OperatorCall<BsFileAuthenticationCA> aggsLambda) {
setCreatedTime_Range("createdTime", opLambda, aggsLambda);
}
@@ -475,7 +478,8 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
setFileConfigId_Terms("fileConfigId", opLambda, null);
}
- public void setFileConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+ public void setFileConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsFileAuthenticationCA> aggsLambda) {
setFileConfigId_Terms("fileConfigId", opLambda, aggsLambda);
}
@@ -659,7 +663,8 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
setHostname_IpRange("hostname", opLambda, null);
}
- public void setHostname_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+ public void setHostname_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsFileAuthenticationCA> aggsLambda) {
setHostname_IpRange("hostname", opLambda, aggsLambda);
}
@@ -714,7 +719,8 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
setHostname_Missing("hostname", opLambda, null);
}
- public void setHostname_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+ public void setHostname_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsFileAuthenticationCA> aggsLambda) {
setHostname_Missing("hostname", opLambda, aggsLambda);
}
@@ -739,7 +745,8 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
setParameters_Terms("parameters", opLambda, null);
}
- public void setParameters_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+ public void setParameters_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsFileAuthenticationCA> aggsLambda) {
setParameters_Terms("parameters", opLambda, aggsLambda);
}
@@ -923,7 +930,8 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
setPassword_IpRange("password", opLambda, null);
}
- public void setPassword_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+ public void setPassword_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsFileAuthenticationCA> aggsLambda) {
setPassword_IpRange("password", opLambda, aggsLambda);
}
@@ -978,7 +986,8 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
setPassword_Missing("password", opLambda, null);
}
- public void setPassword_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+ public void setPassword_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsFileAuthenticationCA> aggsLambda) {
setPassword_Missing("password", opLambda, aggsLambda);
}
@@ -1123,7 +1132,8 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
setPort_Histogram("port", opLambda, null);
}
- public void setPort_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+ public void setPort_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsFileAuthenticationCA> aggsLambda) {
setPort_Histogram("port", opLambda, aggsLambda);
}
@@ -1600,7 +1610,8 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
}
- public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setUpdatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -1641,7 +1652,8 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
setUpdatedTime_Range("updatedTime", opLambda, null);
}
- public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+ public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda,
+ OperatorCall<BsFileAuthenticationCA> aggsLambda) {
setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
}
@@ -1773,7 +1785,8 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
setUsername_IpRange("username", opLambda, null);
}
- public void setUsername_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+ public void setUsername_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsFileAuthenticationCA> aggsLambda) {
setUsername_IpRange("username", opLambda, aggsLambda);
}
@@ -1828,7 +1841,8 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
setUsername_Missing("username", opLambda, null);
}
- public void setUsername_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+ public void setUsername_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsFileAuthenticationCA> aggsLambda) {
setUsername_Missing("username", opLambda, aggsLambda);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
index 42c0eb278..caa4eaa26 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
@@ -219,7 +219,8 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
setAvailable_PercentileRanks("available", values, opLambda);
}
- public void setAvailable_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setAvailable_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "available", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -488,7 +489,8 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
setBoost_Range("boost", opLambda, aggsLambda);
}
- public void setBoost_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+ public void setBoost_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+ OperatorCall<BsFileConfigCA> aggsLambda) {
RangeAggregationBuilder builder = regRangeA(name, "boost");
if (opLambda != null) {
opLambda.callback(builder);
@@ -614,7 +616,8 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
setConfigParameter_IpRange("configParameter", opLambda, null);
}
- public void setConfigParameter_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+ public void setConfigParameter_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsFileConfigCA> aggsLambda) {
setConfigParameter_IpRange("configParameter", opLambda, aggsLambda);
}
@@ -669,7 +672,8 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
setConfigParameter_Missing("configParameter", opLambda, null);
}
- public void setConfigParameter_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+ public void setConfigParameter_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsFileConfigCA> aggsLambda) {
setConfigParameter_Missing("configParameter", opLambda, aggsLambda);
}
@@ -930,7 +934,8 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
setCreatedTime_PercentileRanks("createdTime", values, opLambda);
}
- public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setCreatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -945,7 +950,8 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
setCreatedTime_Histogram("createdTime", opLambda, null);
}
- public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+ public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsFileConfigCA> aggsLambda) {
setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
}
@@ -1199,7 +1205,8 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
setDepth_Range("depth", opLambda, aggsLambda);
}
- public void setDepth_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+ public void setDepth_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+ OperatorCall<BsFileConfigCA> aggsLambda) {
RangeAggregationBuilder builder = regRangeA(name, "depth");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1380,7 +1387,8 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
setExcludedDocPaths_IpRange("excludedDocPaths", opLambda, null);
}
- public void setExcludedDocPaths_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+ public void setExcludedDocPaths_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsFileConfigCA> aggsLambda) {
setExcludedDocPaths_IpRange("excludedDocPaths", opLambda, aggsLambda);
}
@@ -1435,7 +1443,8 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
setExcludedDocPaths_Missing("excludedDocPaths", opLambda, null);
}
- public void setExcludedDocPaths_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+ public void setExcludedDocPaths_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsFileConfigCA> aggsLambda) {
setExcludedDocPaths_Missing("excludedDocPaths", opLambda, aggsLambda);
}
@@ -1642,7 +1651,8 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
setIncludedDocPaths_IpRange("includedDocPaths", opLambda, null);
}
- public void setIncludedDocPaths_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+ public void setIncludedDocPaths_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsFileConfigCA> aggsLambda) {
setIncludedDocPaths_IpRange("includedDocPaths", opLambda, aggsLambda);
}
@@ -1697,7 +1707,8 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
setIncludedDocPaths_Missing("includedDocPaths", opLambda, null);
}
- public void setIncludedDocPaths_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+ public void setIncludedDocPaths_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsFileConfigCA> aggsLambda) {
setIncludedDocPaths_Missing("includedDocPaths", opLambda, aggsLambda);
}
@@ -1974,7 +1985,8 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
setIntervalTime_Histogram("intervalTime", opLambda, null);
}
- public void setIntervalTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+ public void setIntervalTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsFileConfigCA> aggsLambda) {
setIntervalTime_Histogram("intervalTime", opLambda, aggsLambda);
}
@@ -2281,7 +2293,8 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
setMaxAccessCount_Missing("maxAccessCount", opLambda, null);
}
- public void setMaxAccessCount_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+ public void setMaxAccessCount_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsFileConfigCA> aggsLambda) {
setMaxAccessCount_Missing("maxAccessCount", opLambda, aggsLambda);
}
@@ -2541,7 +2554,8 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
setNumOfThread_PercentileRanks("numOfThread", values, opLambda);
}
- public void setNumOfThread_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setNumOfThread_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "numOfThread", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -2556,7 +2570,8 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
setNumOfThread_Histogram("numOfThread", opLambda, null);
}
- public void setNumOfThread_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+ public void setNumOfThread_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsFileConfigCA> aggsLambda) {
setNumOfThread_Histogram("numOfThread", opLambda, aggsLambda);
}
@@ -2665,7 +2680,8 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
setPaths_Terms("paths", opLambda, aggsLambda);
}
- public void setPaths_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+ public void setPaths_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsFileConfigCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "paths");
if (opLambda != null) {
opLambda.callback(builder);
@@ -3027,7 +3043,8 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
setSortOrder_PercentileRanks("sortOrder", values, opLambda);
}
- public void setSortOrder_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setSortOrder_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -3252,7 +3269,8 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
setTimeToLive_PercentileRanks("timeToLive", values, opLambda);
}
- public void setTimeToLive_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setTimeToLive_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "timeToLive", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -3267,7 +3285,8 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
setTimeToLive_Histogram("timeToLive", opLambda, null);
}
- public void setTimeToLive_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+ public void setTimeToLive_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsFileConfigCA> aggsLambda) {
setTimeToLive_Histogram("timeToLive", opLambda, aggsLambda);
}
@@ -3608,7 +3627,8 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
}
- public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setUpdatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -3623,7 +3643,8 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
setUpdatedTime_Histogram("updatedTime", opLambda, null);
}
- public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+ public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsFileConfigCA> aggsLambda) {
setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java
index 489117e25..15a874620 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java
@@ -317,7 +317,8 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
setEndTime_Missing("endTime", opLambda, aggsLambda);
}
- public void setEndTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+ public void setEndTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsJobLogCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "endTime");
if (opLambda != null) {
opLambda.callback(builder);
@@ -391,7 +392,8 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
setJobName_IpRange("jobName", opLambda, aggsLambda);
}
- public void setJobName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+ public void setJobName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsJobLogCA> aggsLambda) {
IpRangeAggregationBuilder builder = regIpRangeA(name, "jobName");
if (opLambda != null) {
opLambda.callback(builder);
@@ -445,7 +447,8 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
setJobName_Missing("jobName", opLambda, aggsLambda);
}
- public void setJobName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+ public void setJobName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsJobLogCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "jobName");
if (opLambda != null) {
opLambda.callback(builder);
@@ -469,7 +472,8 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
setJobStatus_Terms("jobStatus", opLambda, aggsLambda);
}
- public void setJobStatus_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+ public void setJobStatus_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsJobLogCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "jobStatus");
if (opLambda != null) {
opLambda.callback(builder);
@@ -700,7 +704,8 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
setLastUpdated_PercentileRanks("lastUpdated", values, opLambda);
}
- public void setLastUpdated_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setLastUpdated_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "lastUpdated", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -744,7 +749,8 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
setLastUpdated_Range("lastUpdated", opLambda, aggsLambda);
}
- public void setLastUpdated_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+ public void setLastUpdated_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+ OperatorCall<BsJobLogCA> aggsLambda) {
RangeAggregationBuilder builder = regRangeA(name, "lastUpdated");
if (opLambda != null) {
opLambda.callback(builder);
@@ -823,7 +829,8 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
setScriptData_Terms("scriptData", opLambda, aggsLambda);
}
- public void setScriptData_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+ public void setScriptData_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsJobLogCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "scriptData");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1084,7 +1091,8 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
setScriptType_Terms("scriptType", opLambda, aggsLambda);
}
- public void setScriptType_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+ public void setScriptType_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsJobLogCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "scriptType");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1315,7 +1323,8 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
setStartTime_PercentileRanks("startTime", values, opLambda);
}
- public void setStartTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setStartTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "startTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -1359,7 +1368,8 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
setStartTime_Range("startTime", opLambda, aggsLambda);
}
- public void setStartTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+ public void setStartTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+ OperatorCall<BsJobLogCA> aggsLambda) {
RangeAggregationBuilder builder = regRangeA(name, "startTime");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1488,7 +1498,8 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
setTarget_IpRange("target", opLambda, aggsLambda);
}
- public void setTarget_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+ public void setTarget_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsJobLogCA> aggsLambda) {
IpRangeAggregationBuilder builder = regIpRangeA(name, "target");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1542,7 +1553,8 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
setTarget_Missing("target", opLambda, aggsLambda);
}
- public void setTarget_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+ public void setTarget_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsJobLogCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "target");
if (opLambda != null) {
opLambda.callback(builder);
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java
index 8abd29e6f..0e0634224 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java
@@ -317,7 +317,8 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
setBoost_Missing("boost", opLambda, aggsLambda);
}
- public void setBoost_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+ public void setBoost_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsKeyMatchCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "boost");
if (opLambda != null) {
opLambda.callback(builder);
@@ -341,7 +342,8 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
}
- public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+ public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsKeyMatchCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "createdBy");
if (opLambda != null) {
opLambda.callback(builder);
@@ -572,7 +574,8 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
setCreatedTime_PercentileRanks("createdTime", values, opLambda);
}
- public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setCreatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -841,7 +844,8 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
setMaxSize_Range("maxSize", opLambda, aggsLambda);
}
- public void setMaxSize_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+ public void setMaxSize_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+ OperatorCall<BsKeyMatchCA> aggsLambda) {
RangeAggregationBuilder builder = regRangeA(name, "maxSize");
if (opLambda != null) {
opLambda.callback(builder);
@@ -970,7 +974,8 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
setQuery_IpRange("query", opLambda, aggsLambda);
}
- public void setQuery_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+ public void setQuery_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsKeyMatchCA> aggsLambda) {
IpRangeAggregationBuilder builder = regIpRangeA(name, "query");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1024,7 +1029,8 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
setQuery_Missing("query", opLambda, aggsLambda);
}
- public void setQuery_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+ public void setQuery_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsKeyMatchCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "query");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1098,7 +1104,8 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
setTerm_IpRange("term", opLambda, aggsLambda);
}
- public void setTerm_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+ public void setTerm_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsKeyMatchCA> aggsLambda) {
IpRangeAggregationBuilder builder = regIpRangeA(name, "term");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1152,7 +1159,8 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
setTerm_Missing("term", opLambda, aggsLambda);
}
- public void setTerm_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+ public void setTerm_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsKeyMatchCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "term");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1176,7 +1184,8 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
}
- public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+ public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsKeyMatchCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1407,7 +1416,8 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
}
- public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setUpdatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
if (opLambda != null) {
opLambda.callback(builder);
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java
index 789bbcf84..c91093678 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java
@@ -350,7 +350,8 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
setCreatedTime_PercentileRanks("createdTime", values, opLambda);
}
- public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setCreatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -365,7 +366,8 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
setCreatedTime_Histogram("createdTime", opLambda, null);
}
- public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+ public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsLabelTypeCA> aggsLambda) {
setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
}
@@ -786,7 +788,8 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
setName_IpRange("name", opLambda, aggsLambda);
}
- public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+ public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsLabelTypeCA> aggsLambda) {
IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
if (opLambda != null) {
opLambda.callback(builder);
@@ -840,7 +843,8 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
setName_Missing("name", opLambda, aggsLambda);
}
- public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+ public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsLabelTypeCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "name");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1096,7 +1100,8 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
setSortOrder_PercentileRanks("sortOrder", values, opLambda);
}
- public void setSortOrder_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setSortOrder_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -1452,7 +1457,8 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
}
- public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setUpdatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -1467,7 +1473,8 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
setUpdatedTime_Histogram("updatedTime", opLambda, null);
}
- public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+ public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsLabelTypeCA> aggsLambda) {
setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java
index 529c342bc..56c34f94c 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java
@@ -350,7 +350,8 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
setCreatedTime_PercentileRanks("createdTime", values, opLambda);
}
- public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setCreatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -365,7 +366,8 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
setCreatedTime_Histogram("createdTime", opLambda, null);
}
- public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+ public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsPathMappingCA> aggsLambda) {
setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
}
@@ -605,7 +607,8 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
setRegex_Terms("regex", opLambda, aggsLambda);
}
- public void setRegex_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+ public void setRegex_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsPathMappingCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "regex");
if (opLambda != null) {
opLambda.callback(builder);
@@ -967,7 +970,8 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
setSortOrder_PercentileRanks("sortOrder", values, opLambda);
}
- public void setSortOrder_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setSortOrder_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -982,7 +986,8 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
setSortOrder_Histogram("sortOrder", opLambda, null);
}
- public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+ public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsPathMappingCA> aggsLambda) {
setSortOrder_Histogram("sortOrder", opLambda, aggsLambda);
}
@@ -1323,7 +1328,8 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
}
- public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setUpdatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -1338,7 +1344,8 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
setUpdatedTime_Histogram("updatedTime", opLambda, null);
}
- public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+ public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsPathMappingCA> aggsLambda) {
setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java
index 928c7e410..2aaffd261 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java
@@ -481,7 +481,8 @@ public abstract class BsRelatedContentCA extends EsAbstractConditionAggregation
setCreatedTime_PercentileRanks("createdTime", values, opLambda);
}
- public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setCreatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -577,7 +578,8 @@ public abstract class BsRelatedContentCA extends EsAbstractConditionAggregation
setCreatedTime_Missing("createdTime", opLambda, null);
}
- public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
+ public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsRelatedContentCA> aggsLambda) {
setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
}
@@ -707,7 +709,8 @@ public abstract class BsRelatedContentCA extends EsAbstractConditionAggregation
setSortOrder_PercentileRanks("sortOrder", values, opLambda);
}
- public void setSortOrder_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setSortOrder_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -1195,7 +1198,8 @@ public abstract class BsRelatedContentCA extends EsAbstractConditionAggregation
setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
}
- public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setUpdatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -1291,7 +1295,8 @@ public abstract class BsRelatedContentCA extends EsAbstractConditionAggregation
setUpdatedTime_Missing("updatedTime", opLambda, null);
}
- public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
+ public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsRelatedContentCA> aggsLambda) {
setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
}
@@ -1367,7 +1372,8 @@ public abstract class BsRelatedContentCA extends EsAbstractConditionAggregation
setVirtualHost_IpRange("virtualHost", opLambda, null);
}
- public void setVirtualHost_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
+ public void setVirtualHost_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsRelatedContentCA> aggsLambda) {
setVirtualHost_IpRange("virtualHost", opLambda, aggsLambda);
}
@@ -1422,7 +1428,8 @@ public abstract class BsRelatedContentCA extends EsAbstractConditionAggregation
setVirtualHost_Missing("virtualHost", opLambda, null);
}
- public void setVirtualHost_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRelatedContentCA> aggsLambda) {
+ public void setVirtualHost_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsRelatedContentCA> aggsLambda) {
setVirtualHost_Missing("virtualHost", opLambda, aggsLambda);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java
index a424c1506..1cb457792 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java
@@ -350,7 +350,8 @@ public abstract class BsRelatedQueryCA extends EsAbstractConditionAggregation {
setCreatedTime_PercentileRanks("createdTime", values, opLambda);
}
- public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setCreatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -606,7 +607,8 @@ public abstract class BsRelatedQueryCA extends EsAbstractConditionAggregation {
setTerm_Terms("term", opLambda, aggsLambda);
}
- public void setTerm_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRelatedQueryCA> aggsLambda) {
+ public void setTerm_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsRelatedQueryCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "term");
if (opLambda != null) {
opLambda.callback(builder);
@@ -968,7 +970,8 @@ public abstract class BsRelatedQueryCA extends EsAbstractConditionAggregation {
setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
}
- public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setUpdatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
if (opLambda != null) {
opLambda.callback(builder);
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java
index b6a376fdf..745da108e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java
@@ -350,7 +350,8 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
setCreatedTime_PercentileRanks("createdTime", values, opLambda);
}
- public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setCreatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -446,7 +447,8 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
setCreatedTime_Missing("createdTime", opLambda, null);
}
- public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+ public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsRequestHeaderCA> aggsLambda) {
setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
}
@@ -475,7 +477,8 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
setName_Terms("name", opLambda, aggsLambda);
}
- public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+ public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsRequestHeaderCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "name");
if (opLambda != null) {
opLambda.callback(builder);
@@ -837,7 +840,8 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
}
- public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setUpdatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -933,7 +937,8 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
setUpdatedTime_Missing("updatedTime", opLambda, null);
}
- public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+ public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsRequestHeaderCA> aggsLambda) {
setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
}
@@ -1140,7 +1145,8 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
setWebConfigId_IpRange("webConfigId", opLambda, null);
}
- public void setWebConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+ public void setWebConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsRequestHeaderCA> aggsLambda) {
setWebConfigId_IpRange("webConfigId", opLambda, aggsLambda);
}
@@ -1195,7 +1201,8 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
setWebConfigId_Missing("webConfigId", opLambda, null);
}
- public void setWebConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+ public void setWebConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsRequestHeaderCA> aggsLambda) {
setWebConfigId_Missing("webConfigId", opLambda, aggsLambda);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java
index 801fb9776..c5d388166 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java
@@ -118,7 +118,8 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
}
- public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+ public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsRoleTypeCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "createdBy");
if (opLambda != null) {
opLambda.callback(builder);
@@ -349,7 +350,8 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
setCreatedTime_PercentileRanks("createdTime", values, opLambda);
}
- public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setCreatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -523,7 +525,8 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
setName_IpRange("name", opLambda, aggsLambda);
}
- public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+ public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsRoleTypeCA> aggsLambda) {
IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
if (opLambda != null) {
opLambda.callback(builder);
@@ -577,7 +580,8 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
setName_Missing("name", opLambda, aggsLambda);
}
- public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+ public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsRoleTypeCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "name");
if (opLambda != null) {
opLambda.callback(builder);
@@ -702,7 +706,8 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
setSortOrder_PercentileRanks("sortOrder", values, opLambda);
}
- public void setSortOrder_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setSortOrder_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -746,7 +751,8 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
setSortOrder_Range("sortOrder", opLambda, aggsLambda);
}
- public void setSortOrder_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+ public void setSortOrder_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+ OperatorCall<BsRoleTypeCA> aggsLambda) {
RangeAggregationBuilder builder = regRangeA(name, "sortOrder");
if (opLambda != null) {
opLambda.callback(builder);
@@ -825,7 +831,8 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
}
- public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+ public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsRoleTypeCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1056,7 +1063,8 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
}
- public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setUpdatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -1230,7 +1238,8 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
setValue_IpRange("value", opLambda, aggsLambda);
}
- public void setValue_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+ public void setValue_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsRoleTypeCA> aggsLambda) {
IpRangeAggregationBuilder builder = regIpRangeA(name, "value");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1284,7 +1293,8 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
setValue_Missing("value", opLambda, aggsLambda);
}
- public void setValue_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+ public void setValue_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsRoleTypeCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "value");
if (opLambda != null) {
opLambda.callback(builder);
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java
index b9b917d61..73207f840 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java
@@ -219,7 +219,8 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
setAvailable_PercentileRanks("available", values, opLambda);
}
- public void setAvailable_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setAvailable_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "available", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -234,7 +235,8 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
setAvailable_Histogram("available", opLambda, null);
}
- public void setAvailable_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+ public void setAvailable_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsScheduledJobCA> aggsLambda) {
setAvailable_Histogram("available", opLambda, aggsLambda);
}
@@ -800,7 +802,8 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
setCreatedTime_PercentileRanks("createdTime", values, opLambda);
}
- public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setCreatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -972,7 +975,8 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
setCronExpression_IpRange("cronExpression", opLambda, null);
}
- public void setCronExpression_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+ public void setCronExpression_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsScheduledJobCA> aggsLambda) {
setCronExpression_IpRange("cronExpression", opLambda, aggsLambda);
}
@@ -1027,7 +1031,8 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
setCronExpression_Missing("cronExpression", opLambda, null);
}
- public void setCronExpression_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+ public void setCronExpression_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsScheduledJobCA> aggsLambda) {
setCronExpression_Missing("cronExpression", opLambda, aggsLambda);
}
@@ -1157,7 +1162,8 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
setJobLogging_PercentileRanks("jobLogging", values, opLambda);
}
- public void setJobLogging_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setJobLogging_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "jobLogging", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -1172,7 +1178,8 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
setJobLogging_Histogram("jobLogging", opLambda, null);
}
- public void setJobLogging_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+ public void setJobLogging_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsScheduledJobCA> aggsLambda) {
setJobLogging_Histogram("jobLogging", opLambda, aggsLambda);
}
@@ -1281,7 +1288,8 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
setName_Terms("name", opLambda, aggsLambda);
}
- public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+ public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsScheduledJobCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "name");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1774,7 +1782,8 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
setSortOrder_PercentileRanks("sortOrder", values, opLambda);
}
- public void setSortOrder_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setSortOrder_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -1789,7 +1798,8 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
setSortOrder_Histogram("sortOrder", opLambda, null);
}
- public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+ public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsScheduledJobCA> aggsLambda) {
setSortOrder_Histogram("sortOrder", opLambda, aggsLambda);
}
@@ -2261,7 +2271,8 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
}
- public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setUpdatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
if (opLambda != null) {
opLambda.callback(builder);
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java
index b321fb508..e9311fa76 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java
@@ -350,7 +350,8 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
setCreatedTime_PercentileRanks("createdTime", values, opLambda);
}
- public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setCreatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -446,7 +447,8 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
setCreatedTime_Missing("createdTime", opLambda, null);
}
- public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+ public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsThumbnailQueueCA> aggsLambda) {
setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
}
@@ -915,7 +917,8 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
setThumbnailId_IpRange("thumbnail_id", opLambda, null);
}
- public void setThumbnailId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+ public void setThumbnailId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsThumbnailQueueCA> aggsLambda) {
setThumbnailId_IpRange("thumbnail_id", opLambda, aggsLambda);
}
@@ -970,7 +973,8 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
setThumbnailId_Missing("thumbnail_id", opLambda, null);
}
- public void setThumbnailId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+ public void setThumbnailId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsThumbnailQueueCA> aggsLambda) {
setThumbnailId_Missing("thumbnail_id", opLambda, aggsLambda);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java
index 23f1f8b65..3b2d2caf9 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java
@@ -68,7 +68,8 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
}
}
- public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+ public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda,
+ OperatorCall<BsWebAuthenticationCA> aggsLambda) {
GlobalAggregationBuilder builder = regGlobalA(name);
if (opLambda != null) {
opLambda.callback(builder);
@@ -80,7 +81,8 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
}
}
- public void sampler(String name, ConditionOptionCall<SamplerAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+ public void sampler(String name, ConditionOptionCall<SamplerAggregationBuilder> opLambda,
+ OperatorCall<BsWebAuthenticationCA> aggsLambda) {
SamplerAggregationBuilder builder = regSamplerA(name);
if (opLambda != null) {
opLambda.callback(builder);
@@ -165,7 +167,8 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
setAuthRealm_IpRange("authRealm", opLambda, null);
}
- public void setAuthRealm_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+ public void setAuthRealm_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsWebAuthenticationCA> aggsLambda) {
setAuthRealm_IpRange("authRealm", opLambda, aggsLambda);
}
@@ -220,7 +223,8 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
setAuthRealm_Missing("authRealm", opLambda, null);
}
- public void setAuthRealm_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+ public void setAuthRealm_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsWebAuthenticationCA> aggsLambda) {
setAuthRealm_Missing("authRealm", opLambda, aggsLambda);
}
@@ -296,7 +300,8 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
setCreatedBy_IpRange("createdBy", opLambda, null);
}
- public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+ public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsWebAuthenticationCA> aggsLambda) {
setCreatedBy_IpRange("createdBy", opLambda, aggsLambda);
}
@@ -351,7 +356,8 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
setCreatedBy_Missing("createdBy", opLambda, null);
}
- public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+ public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsWebAuthenticationCA> aggsLambda) {
setCreatedBy_Missing("createdBy", opLambda, aggsLambda);
}
@@ -481,7 +487,8 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
setCreatedTime_PercentileRanks("createdTime", values, opLambda);
}
- public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setCreatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -522,7 +529,8 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
setCreatedTime_Range("createdTime", opLambda, null);
}
- public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+ public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda,
+ OperatorCall<BsWebAuthenticationCA> aggsLambda) {
setCreatedTime_Range("createdTime", opLambda, aggsLambda);
}
@@ -654,7 +662,8 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
setHostname_IpRange("hostname", opLambda, null);
}
- public void setHostname_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+ public void setHostname_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsWebAuthenticationCA> aggsLambda) {
setHostname_IpRange("hostname", opLambda, aggsLambda);
}
@@ -709,7 +718,8 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
setHostname_Missing("hostname", opLambda, null);
}
- public void setHostname_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+ public void setHostname_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsWebAuthenticationCA> aggsLambda) {
setHostname_Missing("hostname", opLambda, aggsLambda);
}
@@ -918,7 +928,8 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
setPassword_IpRange("password", opLambda, null);
}
- public void setPassword_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+ public void setPassword_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsWebAuthenticationCA> aggsLambda) {
setPassword_IpRange("password", opLambda, aggsLambda);
}
@@ -973,7 +984,8 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
setPassword_Missing("password", opLambda, null);
}
- public void setPassword_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+ public void setPassword_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsWebAuthenticationCA> aggsLambda) {
setPassword_Missing("password", opLambda, aggsLambda);
}
@@ -1118,7 +1130,8 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
setPort_Histogram("port", opLambda, null);
}
- public void setPort_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+ public void setPort_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsWebAuthenticationCA> aggsLambda) {
setPort_Histogram("port", opLambda, aggsLambda);
}
@@ -1408,7 +1421,8 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
setUpdatedBy_IpRange("updatedBy", opLambda, null);
}
- public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+ public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsWebAuthenticationCA> aggsLambda) {
setUpdatedBy_IpRange("updatedBy", opLambda, aggsLambda);
}
@@ -1463,7 +1477,8 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
setUpdatedBy_Missing("updatedBy", opLambda, null);
}
- public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+ public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsWebAuthenticationCA> aggsLambda) {
setUpdatedBy_Missing("updatedBy", opLambda, aggsLambda);
}
@@ -1593,7 +1608,8 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
}
- public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setUpdatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -1634,7 +1650,8 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
setUpdatedTime_Range("updatedTime", opLambda, null);
}
- public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+ public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda,
+ OperatorCall<BsWebAuthenticationCA> aggsLambda) {
setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
}
@@ -1766,7 +1783,8 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
setUsername_IpRange("username", opLambda, null);
}
- public void setUsername_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+ public void setUsername_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsWebAuthenticationCA> aggsLambda) {
setUsername_IpRange("username", opLambda, aggsLambda);
}
@@ -1821,7 +1839,8 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
setUsername_Missing("username", opLambda, null);
}
- public void setUsername_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+ public void setUsername_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsWebAuthenticationCA> aggsLambda) {
setUsername_Missing("username", opLambda, aggsLambda);
}
@@ -1846,7 +1865,8 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
setWebConfigId_Terms("webConfigId", opLambda, null);
}
- public void setWebConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+ public void setWebConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsWebAuthenticationCA> aggsLambda) {
setWebConfigId_Terms("webConfigId", opLambda, aggsLambda);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
index ca78b401c..f20cc379a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
@@ -219,7 +219,8 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
setAvailable_PercentileRanks("available", values, opLambda);
}
- public void setAvailable_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setAvailable_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "available", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -614,7 +615,8 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
setConfigParameter_IpRange("configParameter", opLambda, null);
}
- public void setConfigParameter_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+ public void setConfigParameter_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsWebConfigCA> aggsLambda) {
setConfigParameter_IpRange("configParameter", opLambda, aggsLambda);
}
@@ -669,7 +671,8 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
setConfigParameter_Missing("configParameter", opLambda, null);
}
- public void setConfigParameter_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+ public void setConfigParameter_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsWebConfigCA> aggsLambda) {
setConfigParameter_Missing("configParameter", opLambda, aggsLambda);
}
@@ -930,7 +933,8 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
setCreatedTime_PercentileRanks("createdTime", values, opLambda);
}
- public void setCreatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setCreatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -945,7 +949,8 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
setCreatedTime_Histogram("createdTime", opLambda, null);
}
- public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+ public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsWebConfigCA> aggsLambda) {
setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
}
@@ -1380,7 +1385,8 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
setExcludedDocUrls_IpRange("excludedDocUrls", opLambda, null);
}
- public void setExcludedDocUrls_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+ public void setExcludedDocUrls_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsWebConfigCA> aggsLambda) {
setExcludedDocUrls_IpRange("excludedDocUrls", opLambda, aggsLambda);
}
@@ -1435,7 +1441,8 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
setExcludedDocUrls_Missing("excludedDocUrls", opLambda, null);
}
- public void setExcludedDocUrls_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+ public void setExcludedDocUrls_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsWebConfigCA> aggsLambda) {
setExcludedDocUrls_Missing("excludedDocUrls", opLambda, aggsLambda);
}
@@ -1642,7 +1649,8 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
setIncludedDocUrls_IpRange("includedDocUrls", opLambda, null);
}
- public void setIncludedDocUrls_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+ public void setIncludedDocUrls_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsWebConfigCA> aggsLambda) {
setIncludedDocUrls_IpRange("includedDocUrls", opLambda, aggsLambda);
}
@@ -1697,7 +1705,8 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
setIncludedDocUrls_Missing("includedDocUrls", opLambda, null);
}
- public void setIncludedDocUrls_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+ public void setIncludedDocUrls_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsWebConfigCA> aggsLambda) {
setIncludedDocUrls_Missing("includedDocUrls", opLambda, aggsLambda);
}
@@ -1974,7 +1983,8 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
setIntervalTime_Histogram("intervalTime", opLambda, null);
}
- public void setIntervalTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+ public void setIntervalTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsWebConfigCA> aggsLambda) {
setIntervalTime_Histogram("intervalTime", opLambda, aggsLambda);
}
@@ -2360,7 +2370,8 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
setName_IpRange("name", opLambda, aggsLambda);
}
- public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+ public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsWebConfigCA> aggsLambda) {
IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
if (opLambda != null) {
opLambda.callback(builder);
@@ -2414,7 +2425,8 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
setName_Missing("name", opLambda, aggsLambda);
}
- public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+ public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsWebConfigCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "name");
if (opLambda != null) {
opLambda.callback(builder);
@@ -2539,7 +2551,8 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
setNumOfThread_PercentileRanks("numOfThread", values, opLambda);
}
- public void setNumOfThread_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setNumOfThread_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "numOfThread", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -2554,7 +2567,8 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
setNumOfThread_Histogram("numOfThread", opLambda, null);
}
- public void setNumOfThread_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+ public void setNumOfThread_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsWebConfigCA> aggsLambda) {
setNumOfThread_Histogram("numOfThread", opLambda, aggsLambda);
}
@@ -2895,7 +2909,8 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
setSortOrder_PercentileRanks("sortOrder", values, opLambda);
}
- public void setSortOrder_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setSortOrder_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -3120,7 +3135,8 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
setTimeToLive_PercentileRanks("timeToLive", values, opLambda);
}
- public void setTimeToLive_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setTimeToLive_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "timeToLive", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -3476,7 +3492,8 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
setUpdatedTime_PercentileRanks("updatedTime", values, opLambda);
}
- public void setUpdatedTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setUpdatedTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -3491,7 +3508,8 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
setUpdatedTime_Histogram("updatedTime", opLambda, null);
}
- public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+ public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsWebConfigCA> aggsLambda) {
setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
}
@@ -3650,7 +3668,8 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
setUrls_IpRange("urls", opLambda, aggsLambda);
}
- public void setUrls_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+ public void setUrls_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsWebConfigCA> aggsLambda) {
IpRangeAggregationBuilder builder = regIpRangeA(name, "urls");
if (opLambda != null) {
opLambda.callback(builder);
@@ -3704,7 +3723,8 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
setUrls_Missing("urls", opLambda, aggsLambda);
}
- public void setUrls_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+ public void setUrls_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsWebConfigCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "urls");
if (opLambda != null) {
opLambda.callback(builder);
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java
index bcb452e17..aa6c65e41 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java
@@ -110,9 +110,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
AccessTokenCQ filterQuery = new AccessTokenCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java
index 363b26100..66a5f470e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java
@@ -109,9 +109,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
BadWordCQ filterQuery = new BadWordCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
index 3bd597acc..73a4cb0a7 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
@@ -111,9 +111,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
BoostDocumentRuleCQ filterQuery = new BoostDocumentRuleCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java
index fc4400ef3..fdfa385d2 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java
@@ -110,9 +110,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
CrawlingInfoCQ filterQuery = new CrawlingInfoCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java
index be36b8f3c..0858ff414 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java
@@ -111,9 +111,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
CrawlingInfoParamCQ filterQuery = new CrawlingInfoParamCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java
index 13c27770e..2f3667788 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java
@@ -62,8 +62,7 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
// ===================================================================================
// Query Control
// =============
- public void functionScore(OperatorCall<DataConfigCQ> queryLambda,
- ScoreFunctionCall<ScoreFunctionCreator<DataConfigCQ>> functionsLambda,
+ public void functionScore(OperatorCall<DataConfigCQ> queryLambda, ScoreFunctionCall<ScoreFunctionCreator<DataConfigCQ>> functionsLambda,
final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
DataConfigCQ cq = new DataConfigCQ();
queryLambda.callback(cq);
@@ -110,9 +109,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
DataConfigCQ filterQuery = new DataConfigCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
@@ -1456,7 +1454,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
setHandlerParameter_MatchPhrasePrefix(handlerParameter, null);
}
- public void setHandlerParameter_MatchPhrasePrefix(String handlerParameter, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+ public void setHandlerParameter_MatchPhrasePrefix(String handlerParameter,
+ ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("handlerParameter", handlerParameter);
if (opLambda != null) {
opLambda.callback(builder);
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java
index 2ad3b04c6..86ab58298 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java
@@ -110,9 +110,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
DuplicateHostCQ filterQuery = new DuplicateHostCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
@@ -666,7 +665,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
setDuplicateHostName_MatchPhrasePrefix(duplicateHostName, null);
}
- public void setDuplicateHostName_MatchPhrasePrefix(String duplicateHostName, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+ public void setDuplicateHostName_MatchPhrasePrefix(String duplicateHostName,
+ ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("duplicateHostName", duplicateHostName);
if (opLambda != null) {
opLambda.callback(builder);
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java
index 690627c72..88fa6ce3e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java
@@ -110,9 +110,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
ElevateWordCQ filterQuery = new ElevateWordCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java
index bce4c8184..e5b401333 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java
@@ -111,9 +111,8 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
ElevateWordToLabelCQ filterQuery = new ElevateWordToLabelCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java
index 205e8f2fb..4689188ba 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java
@@ -62,8 +62,7 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
// ===================================================================================
// Query Control
// =============
- public void functionScore(OperatorCall<FailureUrlCQ> queryLambda,
- ScoreFunctionCall<ScoreFunctionCreator<FailureUrlCQ>> functionsLambda,
+ public void functionScore(OperatorCall<FailureUrlCQ> queryLambda, ScoreFunctionCall<ScoreFunctionCreator<FailureUrlCQ>> functionsLambda,
final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
FailureUrlCQ cq = new FailureUrlCQ();
queryLambda.callback(cq);
@@ -110,9 +109,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
FailureUrlCQ filterQuery = new FailureUrlCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java
index 5942d057e..4a963ddbf 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java
@@ -111,9 +111,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
FileAuthenticationCQ filterQuery = new FileAuthenticationCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java
index c403ea2c8..b252cc538 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java
@@ -62,8 +62,7 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
// ===================================================================================
// Query Control
// =============
- public void functionScore(OperatorCall<FileConfigCQ> queryLambda,
- ScoreFunctionCall<ScoreFunctionCreator<FileConfigCQ>> functionsLambda,
+ public void functionScore(OperatorCall<FileConfigCQ> queryLambda, ScoreFunctionCall<ScoreFunctionCreator<FileConfigCQ>> functionsLambda,
final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
FileConfigCQ cq = new FileConfigCQ();
queryLambda.callback(cq);
@@ -110,9 +109,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
FileConfigCQ filterQuery = new FileConfigCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
@@ -1634,7 +1632,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
setExcludedDocPaths_MatchPhrasePrefix(excludedDocPaths, null);
}
- public void setExcludedDocPaths_MatchPhrasePrefix(String excludedDocPaths, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+ public void setExcludedDocPaths_MatchPhrasePrefix(String excludedDocPaths,
+ ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("excludedDocPaths", excludedDocPaths);
if (opLambda != null) {
opLambda.callback(builder);
@@ -2078,7 +2077,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
setIncludedDocPaths_MatchPhrasePrefix(includedDocPaths, null);
}
- public void setIncludedDocPaths_MatchPhrasePrefix(String includedDocPaths, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+ public void setIncludedDocPaths_MatchPhrasePrefix(String includedDocPaths,
+ ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("includedDocPaths", includedDocPaths);
if (opLambda != null) {
opLambda.callback(builder);
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java
index 2203b2a56..8d4cd2f24 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java
@@ -109,9 +109,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
JobLogCQ filterQuery = new JobLogCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java
index 261765dfd..e67c1b563 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java
@@ -109,9 +109,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
KeyMatchCQ filterQuery = new KeyMatchCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java
index 7aa07c08b..f63b049dd 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java
@@ -109,9 +109,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
LabelTypeCQ filterQuery = new LabelTypeCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java
index bb44c344c..61e4a51d5 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java
@@ -110,9 +110,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
PathMappingCQ filterQuery = new PathMappingCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java
index 2aab33601..41b484f4b 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java
@@ -110,9 +110,8 @@ public abstract class BsRelatedContentCQ extends EsAbstractConditionQuery {
RelatedContentCQ filterQuery = new RelatedContentCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java
index 543ba402f..091002e4c 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java
@@ -110,9 +110,8 @@ public abstract class BsRelatedQueryCQ extends EsAbstractConditionQuery {
RelatedQueryCQ filterQuery = new RelatedQueryCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java
index abd7ac557..9d7ad8e83 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java
@@ -110,9 +110,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
RequestHeaderCQ filterQuery = new RequestHeaderCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java
index 0ed8af7bc..acf2b7583 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java
@@ -109,9 +109,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
RoleTypeCQ filterQuery = new RoleTypeCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java
index d83f558b6..0166d8840 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java
@@ -110,9 +110,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
ScheduledJobCQ filterQuery = new ScheduledJobCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java
index bc5fc26bf..e576d17ef 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java
@@ -110,9 +110,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
ThumbnailQueueCQ filterQuery = new ThumbnailQueueCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java
index a49491d27..df249a62d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java
@@ -111,9 +111,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
WebAuthenticationCQ filterQuery = new WebAuthenticationCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java
index edd7ba529..767d66222 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java
@@ -109,9 +109,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
WebConfigCQ filterQuery = new WebConfigCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java b/src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java
index c8309773a..a2b4d859e 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java
@@ -311,9 +311,8 @@ public class DataConfig extends BsDataConfig implements CrawlingConfig {
authScheme = new NTLMScheme(new JcifsEngine(props));
} else if (Constants.FORM.equals(scheme)) {
final String prefix = CRAWLER_WEB_AUTH + "." + webAuthName + ".";
- final Map<String, String> parameterMap =
- paramMap.entrySet().stream().filter(e -> e.getKey().startsWith(prefix))
- .collect(Collectors.toMap(e -> e.getKey().substring(prefix.length()), Entry::getValue));
+ final Map<String, String> parameterMap = paramMap.entrySet().stream().filter(e -> e.getKey().startsWith(prefix))
+ .collect(Collectors.toMap(e -> e.getKey().substring(prefix.length()), Entry::getValue));
authScheme = new FormScheme(parameterMap);
}
return authScheme;
@@ -329,9 +328,8 @@ public class DataConfig extends BsDataConfig implements CrawlingConfig {
if (Constants.NTLM.equals(scheme)) {
final String workstation = paramMap.get(CRAWLER_WEB_AUTH + "." + webAuthName + ".workstation");
final String domain = paramMap.get(CRAWLER_WEB_AUTH + "." + webAuthName + ".domain");
- credentials =
- new NTCredentials(username, password == null ? StringUtil.EMPTY : password, workstation == null ? StringUtil.EMPTY
- : workstation, domain == null ? StringUtil.EMPTY : domain);
+ credentials = new NTCredentials(username, password == null ? StringUtil.EMPTY : password,
+ workstation == null ? StringUtil.EMPTY : workstation, domain == null ? StringUtil.EMPTY : domain);
} else {
credentials = new UsernamePasswordCredentials(username, password == null ? StringUtil.EMPTY : password);
}
@@ -410,8 +408,8 @@ public class DataConfig extends BsDataConfig implements CrawlingConfig {
@Override
public String toString() {
return "DataConfig [available=" + available + ", boost=" + boost + ", createdBy=" + createdBy + ", createdTime=" + createdTime
- + ", handlerName=" + handlerName + ", handlerParameter=" + handlerParameter + ", handlerScript=" + handlerScript
- + ", name=" + name + ", permissions=" + Arrays.toString(permissions) + ", sortOrder=" + sortOrder + ", updatedBy="
- + updatedBy + ", updatedTime=" + updatedTime + "]";
+ + ", handlerName=" + handlerName + ", handlerParameter=" + handlerParameter + ", handlerScript=" + handlerScript + ", name="
+ + name + ", permissions=" + Arrays.toString(permissions) + ", sortOrder=" + sortOrder + ", updatedBy=" + updatedBy
+ + ", updatedTime=" + updatedTime + "]";
}
}
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/ScheduledJob.java b/src/main/java/org/codelibs/fess/es/config/exentity/ScheduledJob.java
index 63590513b..d4d781455 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/ScheduledJob.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/ScheduledJob.java
@@ -89,9 +89,9 @@ public class ScheduledJob extends BsScheduledJob {
@Override
public String toString() {
- return "ScheduledJob [available=" + available + ", crawler=" + crawler + ", createdBy=" + createdBy + ", createdTime="
- + createdTime + ", cronExpression=" + cronExpression + ", jobLogging=" + jobLogging + ", name=" + name + ", scriptData="
- + scriptData + ", scriptType=" + scriptType + ", sortOrder=" + sortOrder + ", target=" + target + ", updatedBy="
- + updatedBy + ", updatedTime=" + updatedTime + ", docMeta=" + docMeta + "]";
+ return "ScheduledJob [available=" + available + ", crawler=" + crawler + ", createdBy=" + createdBy + ", createdTime=" + createdTime
+ + ", cronExpression=" + cronExpression + ", jobLogging=" + jobLogging + ", name=" + name + ", scriptData=" + scriptData
+ + ", scriptType=" + scriptType + ", sortOrder=" + sortOrder + ", target=" + target + ", updatedBy=" + updatedBy
+ + ", updatedTime=" + updatedTime + ", docMeta=" + docMeta + "]";
}
}
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/WebAuthentication.java b/src/main/java/org/codelibs/fess/es/config/exentity/WebAuthentication.java
index 01dc0df8f..4f2d3d4f4 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/WebAuthentication.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/WebAuthentication.java
@@ -150,7 +150,7 @@ public class WebAuthentication extends BsWebAuthentication {
public String toString() {
return "WebAuthentication [webConfig=" + webConfig + ", authRealm=" + authRealm + ", createdBy=" + createdBy + ", createdTime="
+ createdTime + ", hostname=" + hostname + ", parameters=" + parameters + ", port=" + port + ", protocolScheme="
- + protocolScheme + ", updatedBy=" + updatedBy + ", updatedTime=" + updatedTime + ", username=" + username
- + ", webConfigId=" + webConfigId + ", docMeta=" + docMeta + "]";
+ + protocolScheme + ", updatedBy=" + updatedBy + ", updatedTime=" + updatedTime + ", username=" + username + ", webConfigId="
+ + webConfigId + ", docMeta=" + docMeta + "]";
}
}
diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/WebConfig.java b/src/main/java/org/codelibs/fess/es/config/exentity/WebConfig.java
index a3e1d99e7..763cfbcde 100644
--- a/src/main/java/org/codelibs/fess/es/config/exentity/WebConfig.java
+++ b/src/main/java/org/codelibs/fess/es/config/exentity/WebConfig.java
@@ -198,10 +198,8 @@ public class WebConfig extends BsWebConfig implements CrawlingConfig {
if (StringUtil.isNotBlank(proxyHost) && StringUtil.isNotBlank(proxyPort)) {
// proxy credentials
if (paramMap.get(Param.Client.PROXY_USERNAME) != null && paramMap.get(Param.Client.PROXY_PASSWORD) != null) {
- paramMap.put(
- HcHttpClient.PROXY_CREDENTIALS_PROPERTY,
- new UsernamePasswordCredentials(paramMap.remove(Param.Client.PROXY_USERNAME).toString(), paramMap.remove(
- Param.Client.PROXY_PASSWORD).toString()));
+ paramMap.put(HcHttpClient.PROXY_CREDENTIALS_PROPERTY, new UsernamePasswordCredentials(
+ paramMap.remove(Param.Client.PROXY_USERNAME).toString(), paramMap.remove(Param.Client.PROXY_PASSWORD).toString()));
}
} else {
initializeDefaultHttpProxy(paramMap);
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java
index b24cef17b..8a6940bc1 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java
@@ -126,10 +126,10 @@ public class ClickLogDbm extends AbstractDBMeta {
// ===================================================================================
// Column Info
// ===========
- protected final ColumnInfo _columnUrlId = cci("urlId", "urlId", null, null, String.class, "urlId", null, false, false, false,
- "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnDocId = cci("docId", "docId", null, null, String.class, "docId", null, false, false, false,
- "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnUrlId = cci("urlId", "urlId", null, null, String.class, "urlId", null, false, false, false, "keyword",
+ 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnDocId = cci("docId", "docId", null, null, String.class, "docId", null, false, false, false, "keyword",
+ 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnOrder = cci("order", "order", null, null, Integer.class, "order", null, false, false, false,
"Integer", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false,
@@ -140,8 +140,8 @@ public class ClickLogDbm extends AbstractDBMeta {
false, false, false, "LocalDateTime", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "keyword", 0, 0,
null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnUserSessionId = cci("userSessionId", "userSessionId", null, null, String.class, "userSessionId",
- null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnUserSessionId = cci("userSessionId", "userSessionId", null, null, String.class, "userSessionId", null,
+ false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
public ColumnInfo columnUrlId() {
return _columnUrlId;
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java
index 9bd2ac027..3fc4b0ffa 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java
@@ -125,8 +125,8 @@ public class FavoriteLogDbm extends AbstractDBMeta {
// ===========
protected final ColumnInfo _columnCreatedAt = cci("createdAt", "createdAt", null, null, LocalDateTime.class, "createdAt", null, false,
false, false, "LocalDateTime", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnDocId = cci("docId", "docId", null, null, String.class, "docId", null, false, false, false,
- "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnDocId = cci("docId", "docId", null, null, String.class, "docId", null, false, false, false, "keyword",
+ 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false,
"keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "keyword", 0, 0,
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java
index f5428270d..efc47dc2c 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java
@@ -83,7 +83,8 @@ public class SearchLogDbm extends AbstractDBMeta {
"accessType");
setupEpg(_epgMap, et -> ((SearchLog) et).getClientIp(), (et, vl) -> ((SearchLog) et).setClientIp(DfTypeUtil.toString(vl)),
"clientIp");
- setupEpg(_epgMap, et -> ((SearchLog) et).getHitCount(), (et, vl) -> ((SearchLog) et).setHitCount(DfTypeUtil.toLong(vl)), "hitCount");
+ setupEpg(_epgMap, et -> ((SearchLog) et).getHitCount(), (et, vl) -> ((SearchLog) et).setHitCount(DfTypeUtil.toLong(vl)),
+ "hitCount");
setupEpg(_epgMap, et -> ((SearchLog) et).getHitCountRelation(),
(et, vl) -> ((SearchLog) et).setHitCountRelation(DfTypeUtil.toString(vl)), "hitCountRelation");
setupEpg(_epgMap, et -> ((SearchLog) et).getLanguages(), (et, vl) -> ((SearchLog) et).setLanguages(DfTypeUtil.toString(vl)),
@@ -108,8 +109,8 @@ public class SearchLogDbm extends AbstractDBMeta {
"userAgent");
setupEpg(_epgMap, et -> ((SearchLog) et).getUserInfoId(), (et, vl) -> ((SearchLog) et).setUserInfoId(DfTypeUtil.toString(vl)),
"userInfoId");
- setupEpg(_epgMap, et -> ((SearchLog) et).getUserSessionId(),
- (et, vl) -> ((SearchLog) et).setUserSessionId(DfTypeUtil.toString(vl)), "userSessionId");
+ setupEpg(_epgMap, et -> ((SearchLog) et).getUserSessionId(), (et, vl) -> ((SearchLog) et).setUserSessionId(DfTypeUtil.toString(vl)),
+ "userSessionId");
setupEpg(_epgMap, et -> ((SearchLog) et).getVirtualHost(), (et, vl) -> ((SearchLog) et).setVirtualHost(DfTypeUtil.toString(vl)),
"virtualHost");
}
@@ -160,8 +161,8 @@ public class SearchLogDbm extends AbstractDBMeta {
false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false,
"keyword", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnQueryOffset = cci("queryOffset", "queryOffset", null, null, Integer.class, "queryOffset", null,
- false, false, false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnQueryOffset = cci("queryOffset", "queryOffset", null, null, Integer.class, "queryOffset", null, false,
+ false, false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnQueryPageSize = cci("queryPageSize", "queryPageSize", null, null, Integer.class, "queryPageSize",
null, false, false, false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnQueryTime = cci("queryTime", "queryTime", null, null, Long.class, "queryTime", null, false, false,
@@ -182,8 +183,8 @@ public class SearchLogDbm extends AbstractDBMeta {
false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnUserInfoId = cci("userInfoId", "userInfoId", null, null, String.class, "userInfoId", null, false,
false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnUserSessionId = cci("userSessionId", "userSessionId", null, null, String.class, "userSessionId",
- null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnUserSessionId = cci("userSessionId", "userSessionId", null, null, String.class, "userSessionId", null,
+ false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnVirtualHost = cci("virtualHost", "virtualHost", null, null, String.class, "virtualHost", null, false,
false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java
index ed1e930da..a84588a6f 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java
@@ -170,7 +170,8 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
setUrlId_IpRange("urlId", opLambda, aggsLambda);
}
- public void setUrlId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+ public void setUrlId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsClickLogCA> aggsLambda) {
IpRangeAggregationBuilder builder = regIpRangeA(name, "urlId");
if (opLambda != null) {
opLambda.callback(builder);
@@ -224,7 +225,8 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
setUrlId_Missing("urlId", opLambda, aggsLambda);
}
- public void setUrlId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+ public void setUrlId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsClickLogCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "urlId");
if (opLambda != null) {
opLambda.callback(builder);
@@ -298,7 +300,8 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
setDocId_IpRange("docId", opLambda, aggsLambda);
}
- public void setDocId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+ public void setDocId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsClickLogCA> aggsLambda) {
IpRangeAggregationBuilder builder = regIpRangeA(name, "docId");
if (opLambda != null) {
opLambda.callback(builder);
@@ -352,7 +355,8 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
setDocId_Missing("docId", opLambda, aggsLambda);
}
- public void setDocId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+ public void setDocId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsClickLogCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "docId");
if (opLambda != null) {
opLambda.callback(builder);
@@ -575,7 +579,8 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
setOrder_Missing("order", opLambda, aggsLambda);
}
- public void setOrder_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+ public void setOrder_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsClickLogCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "order");
if (opLambda != null) {
opLambda.callback(builder);
@@ -599,7 +604,8 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
setQueryId_Terms("queryId", opLambda, aggsLambda);
}
- public void setQueryId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+ public void setQueryId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsClickLogCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "queryId");
if (opLambda != null) {
opLambda.callback(builder);
@@ -807,7 +813,8 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
setQueryRequestedAt_Missing("queryRequestedAt", opLambda, null);
}
- public void setQueryRequestedAt_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+ public void setQueryRequestedAt_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsClickLogCA> aggsLambda) {
setQueryRequestedAt_Missing("queryRequestedAt", opLambda, aggsLambda);
}
@@ -992,7 +999,8 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
setUrl_IpRange("url", opLambda, aggsLambda);
}
- public void setUrl_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+ public void setUrl_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsClickLogCA> aggsLambda) {
IpRangeAggregationBuilder builder = regIpRangeA(name, "url");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1046,7 +1054,8 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
setUrl_Missing("url", opLambda, aggsLambda);
}
- public void setUrl_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+ public void setUrl_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsClickLogCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "url");
if (opLambda != null) {
opLambda.callback(builder);
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java
index d3b981ca5..433d3f48c 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java
@@ -106,7 +106,8 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
setCreatedAt_DateRange("createdAt", opLambda, null);
}
- public void setCreatedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+ public void setCreatedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda,
+ OperatorCall<BsFavoriteLogCA> aggsLambda) {
setCreatedAt_DateRange("createdAt", opLambda, aggsLambda);
}
@@ -216,7 +217,8 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
setDocId_Terms("docId", opLambda, aggsLambda);
}
- public void setDocId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+ public void setDocId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsFavoriteLogCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "docId");
if (opLambda != null) {
opLambda.callback(builder);
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java
index 1196d2130..fbb7b6919 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java
@@ -251,7 +251,8 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
setClientIp_Terms("clientIp", opLambda, aggsLambda);
}
- public void setClientIp_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+ public void setClientIp_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsSearchLogCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "clientIp");
if (opLambda != null) {
opLambda.callback(builder);
@@ -526,7 +527,8 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
setHitCount_Range("hitCount", opLambda, aggsLambda);
}
- public void setHitCount_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+ public void setHitCount_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+ OperatorCall<BsSearchLogCA> aggsLambda) {
RangeAggregationBuilder builder = regRangeA(name, "hitCount");
if (opLambda != null) {
opLambda.callback(builder);
@@ -652,7 +654,8 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
setHitCountRelation_IpRange("hitCountRelation", opLambda, null);
}
- public void setHitCountRelation_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+ public void setHitCountRelation_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsSearchLogCA> aggsLambda) {
setHitCountRelation_IpRange("hitCountRelation", opLambda, aggsLambda);
}
@@ -707,7 +710,8 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
setHitCountRelation_Missing("hitCountRelation", opLambda, null);
}
- public void setHitCountRelation_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+ public void setHitCountRelation_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsSearchLogCA> aggsLambda) {
setHitCountRelation_Missing("hitCountRelation", opLambda, aggsLambda);
}
@@ -867,7 +871,8 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
setQueryId_Terms("queryId", opLambda, aggsLambda);
}
- public void setQueryId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+ public void setQueryId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsSearchLogCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "queryId");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1098,7 +1103,8 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
setQueryOffset_PercentileRanks("queryOffset", values, opLambda);
}
- public void setQueryOffset_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setQueryOffset_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "queryOffset", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -1113,7 +1119,8 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
setQueryOffset_Histogram("queryOffset", opLambda, null);
}
- public void setQueryOffset_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+ public void setQueryOffset_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsSearchLogCA> aggsLambda) {
setQueryOffset_Histogram("queryOffset", opLambda, aggsLambda);
}
@@ -1339,7 +1346,8 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
setQueryPageSize_Histogram("queryPageSize", opLambda, null);
}
- public void setQueryPageSize_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+ public void setQueryPageSize_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsSearchLogCA> aggsLambda) {
setQueryPageSize_Histogram("queryPageSize", opLambda, aggsLambda);
}
@@ -1549,7 +1557,8 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
setQueryTime_PercentileRanks("queryTime", values, opLambda);
}
- public void setQueryTime_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setQueryTime_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "queryTime", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -1673,7 +1682,8 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
setReferer_Terms("referer", opLambda, aggsLambda);
}
- public void setReferer_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+ public void setReferer_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsSearchLogCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "referer");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1799,7 +1809,8 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
setRequestedAt_DateRange("requestedAt", opLambda, null);
}
- public void setRequestedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+ public void setRequestedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda,
+ OperatorCall<BsSearchLogCA> aggsLambda) {
setRequestedAt_DateRange("requestedAt", opLambda, aggsLambda);
}
@@ -2026,7 +2037,8 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
setResponseTime_Histogram("responseTime", opLambda, null);
}
- public void setResponseTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+ public void setResponseTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+ OperatorCall<BsSearchLogCA> aggsLambda) {
setResponseTime_Histogram("responseTime", opLambda, aggsLambda);
}
@@ -2446,7 +2458,8 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
setUser_IpRange("user", opLambda, aggsLambda);
}
- public void setUser_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+ public void setUser_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsSearchLogCA> aggsLambda) {
IpRangeAggregationBuilder builder = regIpRangeA(name, "user");
if (opLambda != null) {
opLambda.callback(builder);
@@ -2500,7 +2513,8 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
setUser_Missing("user", opLambda, aggsLambda);
}
- public void setUser_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+ public void setUser_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsSearchLogCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "user");
if (opLambda != null) {
opLambda.callback(builder);
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java
index c14f6c1ba..e9bab4868 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java
@@ -109,9 +109,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
ClickLogCQ filterQuery = new ClickLogCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
@@ -1079,7 +1078,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
setQueryRequestedAt_Terms(queryRequestedAtList, null);
}
- public void setQueryRequestedAt_InScope(Collection<LocalDateTime> queryRequestedAtList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+ public void setQueryRequestedAt_InScope(Collection<LocalDateTime> queryRequestedAtList,
+ ConditionOptionCall<TermsQueryBuilder> opLambda) {
setQueryRequestedAt_Terms(queryRequestedAtList, opLambda);
}
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java
index dde0dd4c9..120546b19 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java
@@ -110,9 +110,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
FavoriteLogCQ filterQuery = new FavoriteLogCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java
index 946389115..eb16c4c47 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java
@@ -109,9 +109,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
SearchLogCQ filterQuery = new SearchLogCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
@@ -887,7 +886,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
setHitCountRelation_MatchPhrasePrefix(hitCountRelation, null);
}
- public void setHitCountRelation_MatchPhrasePrefix(String hitCountRelation, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+ public void setHitCountRelation_MatchPhrasePrefix(String hitCountRelation,
+ ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("hitCountRelation", hitCountRelation);
if (opLambda != null) {
opLambda.callback(builder);
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java
index d5c31e158..08f0bf59d 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java
@@ -105,9 +105,8 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
UserInfoCQ filterQuery = new UserInfoCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/log/exentity/SearchLog.java b/src/main/java/org/codelibs/fess/es/log/exentity/SearchLog.java
index e00239951..c28e91695 100644
--- a/src/main/java/org/codelibs/fess/es/log/exentity/SearchLog.java
+++ b/src/main/java/org/codelibs/fess/es/log/exentity/SearchLog.java
@@ -113,9 +113,8 @@ public class SearchLog extends BsSearchLog {
if (fields != null) {
sourceMap.putAll(fields);
}
- final Map<String, List<String>> searchFieldMap =
- searchFieldLogList.stream().collect(
- Collectors.groupingBy(Pair::getFirst, Collectors.mapping(Pair::getSecond, Collectors.toList())));
+ final Map<String, List<String>> searchFieldMap = searchFieldLogList.stream()
+ .collect(Collectors.groupingBy(Pair::getFirst, Collectors.mapping(Pair::getSecond, Collectors.toList())));
sourceMap.put("searchField", searchFieldMap);
sourceMap.put("documents", documentList);
return sourceMap;
diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java
index e11f53136..3289efe84 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java
@@ -223,7 +223,8 @@ public abstract class BsGroupBhv extends EsAbstractBehavior<Group, GroupCB> {
return batchInsert(list, call, null);
}
- public int[] batchInsert(List<Group> list, RequestOptionCall<BulkRequestBuilder> call, RequestOptionCall<IndexRequestBuilder> entityCall) {
+ public int[] batchInsert(List<Group> list, RequestOptionCall<BulkRequestBuilder> call,
+ RequestOptionCall<IndexRequestBuilder> entityCall) {
return doBatchInsert(new BulkList<>(list, call, entityCall), null);
}
@@ -235,7 +236,8 @@ public abstract class BsGroupBhv extends EsAbstractBehavior<Group, GroupCB> {
return batchUpdate(list, call, null);
}
- public int[] batchUpdate(List<Group> list, RequestOptionCall<BulkRequestBuilder> call, RequestOptionCall<IndexRequestBuilder> entityCall) {
+ public int[] batchUpdate(List<Group> list, RequestOptionCall<BulkRequestBuilder> call,
+ RequestOptionCall<IndexRequestBuilder> entityCall) {
return doBatchUpdate(new BulkList<>(list, call, entityCall), null);
}
@@ -247,7 +249,8 @@ public abstract class BsGroupBhv extends EsAbstractBehavior<Group, GroupCB> {
return batchDelete(list, call, null);
}
- public int[] batchDelete(List<Group> list, RequestOptionCall<BulkRequestBuilder> call, RequestOptionCall<IndexRequestBuilder> entityCall) {
+ public int[] batchDelete(List<Group> list, RequestOptionCall<BulkRequestBuilder> call,
+ RequestOptionCall<IndexRequestBuilder> entityCall) {
return doBatchDelete(new BulkList<>(list, call, entityCall), null);
}
diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java
index 70e73e89d..f511c254e 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java
@@ -222,7 +222,8 @@ public abstract class BsRoleBhv extends EsAbstractBehavior<Role, RoleCB> {
return batchInsert(list, call, null);
}
- public int[] batchInsert(List<Role> list, RequestOptionCall<BulkRequestBuilder> call, RequestOptionCall<IndexRequestBuilder> entityCall) {
+ public int[] batchInsert(List<Role> list, RequestOptionCall<BulkRequestBuilder> call,
+ RequestOptionCall<IndexRequestBuilder> entityCall) {
return doBatchInsert(new BulkList<>(list, call, entityCall), null);
}
@@ -234,7 +235,8 @@ public abstract class BsRoleBhv extends EsAbstractBehavior<Role, RoleCB> {
return batchUpdate(list, call, null);
}
- public int[] batchUpdate(List<Role> list, RequestOptionCall<BulkRequestBuilder> call, RequestOptionCall<IndexRequestBuilder> entityCall) {
+ public int[] batchUpdate(List<Role> list, RequestOptionCall<BulkRequestBuilder> call,
+ RequestOptionCall<IndexRequestBuilder> entityCall) {
return doBatchUpdate(new BulkList<>(list, call, entityCall), null);
}
@@ -246,7 +248,8 @@ public abstract class BsRoleBhv extends EsAbstractBehavior<Role, RoleCB> {
return batchDelete(list, call, null);
}
- public int[] batchDelete(List<Role> list, RequestOptionCall<BulkRequestBuilder> call, RequestOptionCall<IndexRequestBuilder> entityCall) {
+ public int[] batchDelete(List<Role> list, RequestOptionCall<BulkRequestBuilder> call,
+ RequestOptionCall<IndexRequestBuilder> entityCall) {
return doBatchDelete(new BulkList<>(list, call, entityCall), null);
}
diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java
index 2bc8ac331..7a2f408de 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java
@@ -261,7 +261,8 @@ public abstract class BsUserBhv extends EsAbstractBehavior<User, UserCB> {
return batchInsert(list, call, null);
}
- public int[] batchInsert(List<User> list, RequestOptionCall<BulkRequestBuilder> call, RequestOptionCall<IndexRequestBuilder> entityCall) {
+ public int[] batchInsert(List<User> list, RequestOptionCall<BulkRequestBuilder> call,
+ RequestOptionCall<IndexRequestBuilder> entityCall) {
return doBatchInsert(new BulkList<>(list, call, entityCall), null);
}
@@ -273,7 +274,8 @@ public abstract class BsUserBhv extends EsAbstractBehavior<User, UserCB> {
return batchUpdate(list, call, null);
}
- public int[] batchUpdate(List<User> list, RequestOptionCall<BulkRequestBuilder> call, RequestOptionCall<IndexRequestBuilder> entityCall) {
+ public int[] batchUpdate(List<User> list, RequestOptionCall<BulkRequestBuilder> call,
+ RequestOptionCall<IndexRequestBuilder> entityCall) {
return doBatchUpdate(new BulkList<>(list, call, entityCall), null);
}
@@ -285,7 +287,8 @@ public abstract class BsUserBhv extends EsAbstractBehavior<User, UserCB> {
return batchDelete(list, call, null);
}
- public int[] batchDelete(List<User> list, RequestOptionCall<BulkRequestBuilder> call, RequestOptionCall<IndexRequestBuilder> entityCall) {
+ public int[] batchDelete(List<User> list, RequestOptionCall<BulkRequestBuilder> call,
+ RequestOptionCall<IndexRequestBuilder> entityCall) {
return doBatchDelete(new BulkList<>(list, call, entityCall), null);
}
diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java
index 3c2d08b43..c602ae2f4 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java
@@ -192,26 +192,26 @@ public class UserDbm extends AbstractDBMeta {
null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnEmployeeType = cci("employeeType", "employeeType", null, null, String.class, "employeeType", null,
false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnFacsimileTelephoneNumber = cci("facsimileTelephoneNumber", "facsimileTelephoneNumber", null, null,
- String.class, "facsimileTelephoneNumber", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null,
- null, null, false);
+ protected final ColumnInfo _columnFacsimileTelephoneNumber =
+ cci("facsimileTelephoneNumber", "facsimileTelephoneNumber", null, null, String.class, "facsimileTelephoneNumber", null, false,
+ false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnGidNumber = cci("gidNumber", "gidNumber", null, null, Long.class, "gidNumber", null, false, false,
false, "Long", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnGivenName = cci("givenName", "givenName", null, null, String.class, "givenName", null, false, false,
false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnGroups = cci("groups", "groups", null, null, String[].class, "groups", null, false, false, false,
"keyword", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnHomeDirectory = cci("homeDirectory", "homeDirectory", null, null, String.class, "homeDirectory",
- null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnHomeDirectory = cci("homeDirectory", "homeDirectory", null, null, String.class, "homeDirectory", null,
+ false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnHomePhone = cci("homePhone", "homePhone", null, null, String.class, "homePhone", null, false, false,
false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnHomePostalAddress = cci("homePostalAddress", "homePostalAddress", null, null, String.class,
"homePostalAddress", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnInitials = cci("initials", "initials", null, null, String.class, "initials", null, false, false,
false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnInternationaliSDNNumber = cci("internationaliSDNNumber", "internationaliSDNNumber", null, null,
- String.class, "internationaliSDNNumber", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null,
- null, false);
+ protected final ColumnInfo _columnInternationaliSDNNumber =
+ cci("internationaliSDNNumber", "internationaliSDNNumber", null, null, String.class, "internationaliSDNNumber", null, false,
+ false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnLabeledURI = cci("labeledURI", "labeledURI", null, null, String.class, "labeledURI", null, false,
false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnMail = cci("mail", "mail", null, null, String.class, "mail", null, false, false, false, "keyword", 0,
@@ -220,17 +220,17 @@ public class UserDbm extends AbstractDBMeta {
"keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnPager = cci("pager", "pager", null, null, String.class, "pager", null, false, false, false,
- "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnPager = cci("pager", "pager", null, null, String.class, "pager", null, false, false, false, "keyword",
+ 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false,
false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnPhysicalDeliveryOfficeName = cci("physicalDeliveryOfficeName", "physicalDeliveryOfficeName", null,
- null, String.class, "physicalDeliveryOfficeName", null, false, false, false, "keyword", 0, 0, null, null, false, null, null,
- null, null, null, false);
- protected final ColumnInfo _columnPostOfficeBox = cci("postOfficeBox", "postOfficeBox", null, null, String.class, "postOfficeBox",
- null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnPostalAddress = cci("postalAddress", "postalAddress", null, null, String.class, "postalAddress",
- null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnPhysicalDeliveryOfficeName =
+ cci("physicalDeliveryOfficeName", "physicalDeliveryOfficeName", null, null, String.class, "physicalDeliveryOfficeName", null,
+ false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnPostOfficeBox = cci("postOfficeBox", "postOfficeBox", null, null, String.class, "postOfficeBox", null,
+ false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnPostalAddress = cci("postalAddress", "postalAddress", null, null, String.class, "postalAddress", null,
+ false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnPostalCode = cci("postalCode", "postalCode", null, null, String.class, "postalCode", null, false,
false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnPreferredLanguage = cci("preferredLanguage", "preferredLanguage", null, null, String.class,
@@ -241,19 +241,19 @@ public class UserDbm extends AbstractDBMeta {
"keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnRoomNumber = cci("roomNumber", "roomNumber", null, null, String.class, "roomNumber", null, false,
false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnState = cci("state", "state", null, null, String.class, "state", null, false, false, false,
- "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnState = cci("state", "state", null, null, String.class, "state", null, false, false, false, "keyword",
+ 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnStreet = cci("street", "street", null, null, String.class, "street", null, false, false, false,
"keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnSurname = cci("surname", "surname", null, null, String.class, "surname", null, false, false, false,
"keyword", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnTelephoneNumber = cci("telephoneNumber", "telephoneNumber", null, null, String.class,
"telephoneNumber", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnTeletexTerminalIdentifier = cci("teletexTerminalIdentifier", "teletexTerminalIdentifier", null, null,
- String.class, "teletexTerminalIdentifier", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null,
- null, null, false);
- protected final ColumnInfo _columnTitle = cci("title", "title", null, null, String.class, "title", null, false, false, false,
- "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnTeletexTerminalIdentifier =
+ cci("teletexTerminalIdentifier", "teletexTerminalIdentifier", null, null, String.class, "teletexTerminalIdentifier", null,
+ false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false);
+ protected final ColumnInfo _columnTitle = cci("title", "title", null, null, String.class, "title", null, false, false, false, "keyword",
+ 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnUidNumber = cci("uidNumber", "uidNumber", null, null, Long.class, "uidNumber", null, false, false,
false, "Long", 0, 0, null, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnX121Address = cci("x121Address", "x121Address", null, null, String.class, "x121Address", null, false,
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java
index 866dbe466..041d93c96 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java
@@ -219,7 +219,8 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
setGidNumber_PercentileRanks("gidNumber", values, opLambda);
}
- public void setGidNumber_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setGidNumber_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "gidNumber", values);
if (opLambda != null) {
opLambda.callback(builder);
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java
index 9a63d3a8a..c963f0bf9 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java
@@ -128,7 +128,8 @@ public abstract class BsRoleCA extends EsAbstractConditionAggregation {
setName_SignificantTerms("name", opLambda, null);
}
- public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda, OperatorCall<BsRoleCA> aggsLambda) {
+ public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+ OperatorCall<BsRoleCA> aggsLambda) {
setName_SignificantTerms("name", opLambda, aggsLambda);
}
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java
index c0b32b28c..fb43a1865 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java
@@ -399,7 +399,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setCity_SignificantTerms("city", opLambda, null);
}
- public void setCity_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setCity_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
setCity_SignificantTerms("city", opLambda, aggsLambda);
}
@@ -637,7 +638,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setDescription_Terms("description", opLambda, aggsLambda);
}
- public void setDescription_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setDescription_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "description");
if (opLambda != null) {
opLambda.callback(builder);
@@ -814,7 +816,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setDestinationIndicator_IpRange("destinationIndicator", opLambda, null);
}
- public void setDestinationIndicator_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setDestinationIndicator_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
setDestinationIndicator_IpRange("destinationIndicator", opLambda, aggsLambda);
}
@@ -869,7 +872,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setDestinationIndicator_Missing("destinationIndicator", opLambda, null);
}
- public void setDestinationIndicator_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setDestinationIndicator_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
setDestinationIndicator_Missing("destinationIndicator", opLambda, aggsLambda);
}
@@ -898,7 +902,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setDisplayName_Terms("displayName", opLambda, aggsLambda);
}
- public void setDisplayName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setDisplayName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "displayName");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1159,7 +1164,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setEmployeeType_Terms("employeeType", opLambda, aggsLambda);
}
- public void setEmployeeType_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setEmployeeType_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "employeeType");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1285,7 +1291,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setFacsimileTelephoneNumber_Terms("facsimileTelephoneNumber", opLambda, null);
}
- public void setFacsimileTelephoneNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setFacsimileTelephoneNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
setFacsimileTelephoneNumber_Terms("facsimileTelephoneNumber", opLambda, aggsLambda);
}
@@ -1523,7 +1530,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setGidNumber_PercentileRanks("gidNumber", values, opLambda);
}
- public void setGidNumber_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setGidNumber_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "gidNumber", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -1621,7 +1629,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setGidNumber_Missing("gidNumber", opLambda, aggsLambda);
}
- public void setGidNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setGidNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "gidNumber");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1695,7 +1704,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setGivenName_IpRange("givenName", opLambda, aggsLambda);
}
- public void setGivenName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setGivenName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
IpRangeAggregationBuilder builder = regIpRangeA(name, "givenName");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1749,7 +1759,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setGivenName_Missing("givenName", opLambda, aggsLambda);
}
- public void setGivenName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setGivenName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "givenName");
if (opLambda != null) {
opLambda.callback(builder);
@@ -1901,7 +1912,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setHomeDirectory_Terms("homeDirectory", opLambda, aggsLambda);
}
- public void setHomeDirectory_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setHomeDirectory_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "homeDirectory");
if (opLambda != null) {
opLambda.callback(builder);
@@ -2081,7 +2093,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setHomePhone_IpRange("homePhone", opLambda, aggsLambda);
}
- public void setHomePhone_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setHomePhone_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
IpRangeAggregationBuilder builder = regIpRangeA(name, "homePhone");
if (opLambda != null) {
opLambda.callback(builder);
@@ -2135,7 +2148,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setHomePhone_Missing("homePhone", opLambda, aggsLambda);
}
- public void setHomePhone_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setHomePhone_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "homePhone");
if (opLambda != null) {
opLambda.callback(builder);
@@ -2340,7 +2354,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setInitials_IpRange("initials", opLambda, aggsLambda);
}
- public void setInitials_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setInitials_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
IpRangeAggregationBuilder builder = regIpRangeA(name, "initials");
if (opLambda != null) {
opLambda.callback(builder);
@@ -2394,7 +2409,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setInitials_Missing("initials", opLambda, aggsLambda);
}
- public void setInitials_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setInitials_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "initials");
if (opLambda != null) {
opLambda.callback(builder);
@@ -2701,7 +2717,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setMail_SignificantTerms("mail", opLambda, null);
}
- public void setMail_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setMail_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
setMail_SignificantTerms("mail", opLambda, aggsLambda);
}
@@ -2956,7 +2973,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setName_SignificantTerms("name", opLambda, null);
}
- public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
setName_SignificantTerms("name", opLambda, aggsLambda);
}
@@ -3241,7 +3259,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setPassword_IpRange("password", opLambda, aggsLambda);
}
- public void setPassword_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setPassword_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
IpRangeAggregationBuilder builder = regIpRangeA(name, "password");
if (opLambda != null) {
opLambda.callback(builder);
@@ -3295,7 +3314,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setPassword_Missing("password", opLambda, aggsLambda);
}
- public void setPassword_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setPassword_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "password");
if (opLambda != null) {
opLambda.callback(builder);
@@ -3315,7 +3335,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setPhysicalDeliveryOfficeName_Terms("physicalDeliveryOfficeName", opLambda, null);
}
- public void setPhysicalDeliveryOfficeName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setPhysicalDeliveryOfficeName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
setPhysicalDeliveryOfficeName_Terms("physicalDeliveryOfficeName", opLambda, aggsLambda);
}
@@ -3452,7 +3473,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setPostOfficeBox_Terms("postOfficeBox", opLambda, aggsLambda);
}
- public void setPostOfficeBox_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setPostOfficeBox_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "postOfficeBox");
if (opLambda != null) {
opLambda.callback(builder);
@@ -3582,7 +3604,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setPostalAddress_Terms("postalAddress", opLambda, aggsLambda);
}
- public void setPostalAddress_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setPostalAddress_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "postalAddress");
if (opLambda != null) {
opLambda.callback(builder);
@@ -4668,7 +4691,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setSurname_IpRange("surname", opLambda, aggsLambda);
}
- public void setSurname_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setSurname_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
IpRangeAggregationBuilder builder = regIpRangeA(name, "surname");
if (opLambda != null) {
opLambda.callback(builder);
@@ -4722,7 +4746,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setSurname_Missing("surname", opLambda, aggsLambda);
}
- public void setSurname_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setSurname_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "surname");
if (opLambda != null) {
opLambda.callback(builder);
@@ -4873,7 +4898,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setTeletexTerminalIdentifier_Terms("teletexTerminalIdentifier", opLambda, null);
}
- public void setTeletexTerminalIdentifier_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setTeletexTerminalIdentifier_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
setTeletexTerminalIdentifier_Terms("teletexTerminalIdentifier", opLambda, aggsLambda);
}
@@ -4903,8 +4929,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setTeletexTerminalIdentifier_SignificantTerms("teletexTerminalIdentifier", opLambda, aggsLambda);
}
- public void setTeletexTerminalIdentifier_SignificantTerms(String name,
- ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setTeletexTerminalIdentifier_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "teletexTerminalIdentifier");
if (opLambda != null) {
opLambda.callback(builder);
@@ -5239,7 +5265,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setUidNumber_PercentileRanks("uidNumber", values, opLambda);
}
- public void setUidNumber_PercentileRanks(String name, double[] values, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+ public void setUidNumber_PercentileRanks(String name, double[] values,
+ ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "uidNumber", values);
if (opLambda != null) {
opLambda.callback(builder);
@@ -5337,7 +5364,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setUidNumber_Missing("uidNumber", opLambda, aggsLambda);
}
- public void setUidNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setUidNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
MissingAggregationBuilder builder = regMissingA(name, "uidNumber");
if (opLambda != null) {
opLambda.callback(builder);
@@ -5361,7 +5389,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
setX121Address_Terms("x121Address", opLambda, aggsLambda);
}
- public void setX121Address_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+ public void setX121Address_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+ OperatorCall<BsUserCA> aggsLambda) {
TermsAggregationBuilder builder = regTermsA(name, "x121Address");
if (opLambda != null) {
opLambda.callback(builder);
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java
index f051acfcb..2d04f00a2 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java
@@ -109,9 +109,8 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
GroupCQ filterQuery = new GroupCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java
index c914721cc..82a08c524 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java
@@ -109,9 +109,8 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery {
RoleCQ filterQuery = new RoleCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java
index 78e2ec17a..8f0a411e7 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java
@@ -109,9 +109,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
UserCQ filterQuery = new UserCQ();
boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery);
if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) {
- BoolQueryBuilder builder =
- regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(),
- filterQuery.getQueryBuilderList());
+ BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(),
+ mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList());
if (opLambda != null) {
opLambda.callback(builder);
}
@@ -265,7 +264,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
setBusinessCategory_MatchPhrasePrefix(businessCategory, null);
}
- public void setBusinessCategory_MatchPhrasePrefix(String businessCategory, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+ public void setBusinessCategory_MatchPhrasePrefix(String businessCategory,
+ ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("businessCategory", businessCategory);
if (opLambda != null) {
opLambda.callback(builder);
@@ -931,7 +931,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
setDepartmentNumber_MatchPhrasePrefix(departmentNumber, null);
}
- public void setDepartmentNumber_MatchPhrasePrefix(String departmentNumber, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+ public void setDepartmentNumber_MatchPhrasePrefix(String departmentNumber,
+ ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("departmentNumber", departmentNumber);
if (opLambda != null) {
opLambda.callback(builder);
@@ -1334,7 +1335,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
setDestinationIndicator_Terms(destinationIndicatorList, null);
}
- public void setDestinationIndicator_Terms(Collection<String> destinationIndicatorList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+ public void setDestinationIndicator_Terms(Collection<String> destinationIndicatorList,
+ ConditionOptionCall<TermsQueryBuilder> opLambda) {
TermsQueryBuilder builder = regTermsQ("destinationIndicator", destinationIndicatorList);
if (opLambda != null) {
opLambda.callback(builder);
@@ -1345,7 +1347,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
setDestinationIndicator_Terms(destinationIndicatorList, null);
}
- public void setDestinationIndicator_InScope(Collection<String> destinationIndicatorList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+ public void setDestinationIndicator_InScope(Collection<String> destinationIndicatorList,
+ ConditionOptionCall<TermsQueryBuilder> opLambda) {
setDestinationIndicator_Terms(destinationIndicatorList, opLambda);
}
@@ -3557,7 +3560,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
setHomePostalAddress_MatchPhrasePrefix(homePostalAddress, null);
}
- public void setHomePostalAddress_MatchPhrasePrefix(String homePostalAddress, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+ public void setHomePostalAddress_MatchPhrasePrefix(String homePostalAddress,
+ ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("homePostalAddress", homePostalAddress);
if (opLambda != null) {
opLambda.callback(builder);
@@ -3992,7 +3996,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
setInternationaliSDNNumber_MatchPhrase(internationaliSDNNumber, null);
}
- public void setInternationaliSDNNumber_MatchPhrase(String internationaliSDNNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+ public void setInternationaliSDNNumber_MatchPhrase(String internationaliSDNNumber,
+ ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
MatchPhraseQueryBuilder builder = regMatchPhraseQ("internationaliSDNNumber", internationaliSDNNumber);
if (opLambda != null) {
opLambda.callback(builder);
@@ -4129,7 +4134,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
setInternationaliSDNNumber_CommonTerms(internationaliSDNNumber, null);
}
- public void setInternationaliSDNNumber_CommonTerms(String internationaliSDNNumber, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
+ public void setInternationaliSDNNumber_CommonTerms(String internationaliSDNNumber,
+ ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("internationaliSDNNumber", internationaliSDNNumber);
if (opLambda != null) {
opLambda.callback(builder);
@@ -5595,7 +5601,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
setPhysicalDeliveryOfficeName_Wildcard(physicalDeliveryOfficeName, null);
}
- public void setPhysicalDeliveryOfficeName_Wildcard(String physicalDeliveryOfficeName, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+ public void setPhysicalDeliveryOfficeName_Wildcard(String physicalDeliveryOfficeName,
+ ConditionOptionCall<WildcardQueryBuilder> opLambda) {
WildcardQueryBuilder builder = regWildcardQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
if (opLambda != null) {
opLambda.callback(builder);
@@ -5617,7 +5624,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
setPhysicalDeliveryOfficeName_SpanTerm("physicalDeliveryOfficeName", null);
}
- public void setPhysicalDeliveryOfficeName_SpanTerm(String physicalDeliveryOfficeName, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+ public void setPhysicalDeliveryOfficeName_SpanTerm(String physicalDeliveryOfficeName,
+ ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
SpanTermQueryBuilder builder = regSpanTermQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
if (opLambda != null) {
opLambda.callback(builder);
@@ -5628,7 +5636,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
setPhysicalDeliveryOfficeName_GreaterThan(physicalDeliveryOfficeName, null);
}
- public void setPhysicalDeliveryOfficeName_GreaterThan(String physicalDeliveryOfficeName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+ public void setPhysicalDeliveryOfficeName_GreaterThan(String physicalDeliveryOfficeName,
+ ConditionOptionCall<RangeQueryBuilder> opLambda) {
final Object _value = physicalDeliveryOfficeName;
RangeQueryBuilder builder = regRangeQ("physicalDeliveryOfficeName", ConditionKey.CK_GREATER_THAN, _value);
if (opLambda != null) {
@@ -5665,7 +5674,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
setPhysicalDeliveryOfficeName_LessEqual(physicalDeliveryOfficeName, null);
}
- public void setPhysicalDeliveryOfficeName_LessEqual(String physicalDeliveryOfficeName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+ public void setPhysicalDeliveryOfficeName_LessEqual(String physicalDeliveryOfficeName,
+ ConditionOptionCall<RangeQueryBuilder> opLambda) {
final Object _value = physicalDeliveryOfficeName;
RangeQueryBuilder builder = regRangeQ("physicalDeliveryOfficeName", ConditionKey.CK_LESS_EQUAL, _value);
if (opLambda != null) {
@@ -6452,7 +6462,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
setPreferredLanguage_MatchPhrasePrefix(preferredLanguage, null);
}
- public void setPreferredLanguage_MatchPhrasePrefix(String preferredLanguage, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+ public void setPreferredLanguage_MatchPhrasePrefix(String preferredLanguage,
+ ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("preferredLanguage", preferredLanguage);
if (opLambda != null) {
opLambda.callback(builder);
@@ -6674,7 +6685,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
setRegisteredAddress_MatchPhrasePrefix(registeredAddress, null);
}
- public void setRegisteredAddress_MatchPhrasePrefix(String registeredAddress, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+ public void setRegisteredAddress_MatchPhrasePrefix(String registeredAddress,
+ ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("registeredAddress", registeredAddress);
if (opLambda != null) {
opLambda.callback(builder);
@@ -8265,7 +8277,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
setTeletexTerminalIdentifier_Wildcard(teletexTerminalIdentifier, null);
}
- public void setTeletexTerminalIdentifier_Wildcard(String teletexTerminalIdentifier, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
+ public void setTeletexTerminalIdentifier_Wildcard(String teletexTerminalIdentifier,
+ ConditionOptionCall<WildcardQueryBuilder> opLambda) {
WildcardQueryBuilder builder = regWildcardQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
if (opLambda != null) {
opLambda.callback(builder);
@@ -8287,7 +8300,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
setTeletexTerminalIdentifier_SpanTerm("teletexTerminalIdentifier", null);
}
- public void setTeletexTerminalIdentifier_SpanTerm(String teletexTerminalIdentifier, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+ public void setTeletexTerminalIdentifier_SpanTerm(String teletexTerminalIdentifier,
+ ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
SpanTermQueryBuilder builder = regSpanTermQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
if (opLambda != null) {
opLambda.callback(builder);
@@ -8298,7 +8312,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
setTeletexTerminalIdentifier_GreaterThan(teletexTerminalIdentifier, null);
}
- public void setTeletexTerminalIdentifier_GreaterThan(String teletexTerminalIdentifier, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+ public void setTeletexTerminalIdentifier_GreaterThan(String teletexTerminalIdentifier,
+ ConditionOptionCall<RangeQueryBuilder> opLambda) {
final Object _value = teletexTerminalIdentifier;
RangeQueryBuilder builder = regRangeQ("teletexTerminalIdentifier", ConditionKey.CK_GREATER_THAN, _value);
if (opLambda != null) {
@@ -8322,7 +8337,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
setTeletexTerminalIdentifier_GreaterEqual(teletexTerminalIdentifier, null);
}
- public void setTeletexTerminalIdentifier_GreaterEqual(String teletexTerminalIdentifier, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+ public void setTeletexTerminalIdentifier_GreaterEqual(String teletexTerminalIdentifier,
+ ConditionOptionCall<RangeQueryBuilder> opLambda) {
final Object _value = teletexTerminalIdentifier;
RangeQueryBuilder builder = regRangeQ("teletexTerminalIdentifier", ConditionKey.CK_GREATER_EQUAL, _value);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/exec/Crawler.java b/src/main/java/org/codelibs/fess/exec/Crawler.java
index 6736b3db1..00c81e644 100644
--- a/src/main/java/org/codelibs/fess/exec/Crawler.java
+++ b/src/main/java/org/codelibs/fess/exec/Crawler.java
@@ -261,9 +261,8 @@ public class Crawler {
}, "ProcessCommand");
commandThread.start();
- systemMonitorTask =
- TimeoutManager.getInstance().addTimeoutTarget(new SystemMonitorTarget(),
- ComponentUtil.getFessConfig().getCrawlerSystemMonitorIntervalAsInteger(), true);
+ systemMonitorTask = TimeoutManager.getInstance().addTimeoutTarget(new SystemMonitorTarget(),
+ ComponentUtil.getFessConfig().getCrawlerSystemMonitorIntervalAsInteger(), true);
exitCode = process(options);
} catch (final ContainerNotAvailableException e) {
@@ -481,8 +480,8 @@ public class Crawler {
}
// delete expired sessions
- crawlingInfoService.deleteSessionIdsBefore(options.sessionId, options.name, ComponentUtil.getSystemHelper()
- .getCurrentTimeAsLong());
+ crawlingInfoService.deleteSessionIdsBefore(options.sessionId, options.name,
+ ComponentUtil.getSystemHelper().getCurrentTimeAsLong());
final List<String> webConfigIdList = options.getWebConfigIdList();
final List<String> fileConfigIdList = options.getFileConfigIdList();
@@ -495,20 +494,20 @@ public class Crawler {
if (runAll || webConfigIdList != null || fileConfigIdList != null) {
webFsCrawlerThread = new Thread((Runnable) () -> {
// crawl web
- writeTimeToSessionInfo(crawlingInfoHelper, Constants.WEB_FS_CRAWLER_START_TIME);
- webFsIndexHelper.crawl(options.sessionId, webConfigIdList, fileConfigIdList);
- writeTimeToSessionInfo(crawlingInfoHelper, Constants.WEB_FS_CRAWLER_END_TIME);
- }, WEB_FS_CRAWLING_PROCESS);
+ writeTimeToSessionInfo(crawlingInfoHelper, Constants.WEB_FS_CRAWLER_START_TIME);
+ webFsIndexHelper.crawl(options.sessionId, webConfigIdList, fileConfigIdList);
+ writeTimeToSessionInfo(crawlingInfoHelper, Constants.WEB_FS_CRAWLER_END_TIME);
+ }, WEB_FS_CRAWLING_PROCESS);
webFsCrawlerThread.start();
}
if (runAll || dataConfigIdList != null) {
dataCrawlerThread = new Thread((Runnable) () -> {
// crawl data system
- writeTimeToSessionInfo(crawlingInfoHelper, Constants.DATA_CRAWLER_START_TIME);
- dataIndexHelper.crawl(options.sessionId, dataConfigIdList);
- writeTimeToSessionInfo(crawlingInfoHelper, Constants.DATA_CRAWLER_END_TIME);
- }, DATA_CRAWLING_PROCESS);
+ writeTimeToSessionInfo(crawlingInfoHelper, Constants.DATA_CRAWLER_START_TIME);
+ dataIndexHelper.crawl(options.sessionId, dataConfigIdList);
+ writeTimeToSessionInfo(crawlingInfoHelper, Constants.DATA_CRAWLER_END_TIME);
+ }, DATA_CRAWLING_PROCESS);
dataCrawlerThread.start();
}
@@ -527,8 +526,8 @@ public class Crawler {
pathMappingHelper.removePathMappingList(options.sessionId);
crawlingInfoHelper.putToInfoMap(Constants.CRAWLER_STATUS, errors.isEmpty() ? Constants.T.toString() : Constants.F.toString());
if (!errors.isEmpty()) {
- crawlingInfoHelper.putToInfoMap(Constants.CRAWLER_ERRORS, errors.stream().map(s -> s.replace(" ", StringUtil.EMPTY))
- .collect(Collectors.joining(" ")));
+ crawlingInfoHelper.putToInfoMap(Constants.CRAWLER_ERRORS,
+ errors.stream().map(s -> s.replace(" ", StringUtil.EMPTY)).collect(Collectors.joining(" ")));
}
writeTimeToSessionInfo(crawlingInfoHelper, Constants.CRAWLER_END_TIME);
crawlingInfoHelper.putToInfoMap(Constants.CRAWLER_EXEC_TIME, Long.toString(System.currentTimeMillis() - totalTime));
diff --git a/src/main/java/org/codelibs/fess/exec/SuggestCreator.java b/src/main/java/org/codelibs/fess/exec/SuggestCreator.java
index dd3c6d138..bcedbddc0 100644
--- a/src/main/java/org/codelibs/fess/exec/SuggestCreator.java
+++ b/src/main/java/org/codelibs/fess/exec/SuggestCreator.java
@@ -127,9 +127,8 @@ public class SuggestCreator {
};
Runtime.getRuntime().addShutdownHook(shutdownCallback);
- systemMonitorTask =
- TimeoutManager.getInstance().addTimeoutTarget(new SystemMonitorTarget(),
- ComponentUtil.getFessConfig().getSuggestSystemMonitorIntervalAsInteger(), true);
+ systemMonitorTask = TimeoutManager.getInstance().addTimeoutTarget(new SystemMonitorTarget(),
+ ComponentUtil.getFessConfig().getSuggestSystemMonitorIntervalAsInteger(), true);
exitCode = process(options);
} catch (final ContainerNotAvailableException e) {
diff --git a/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java b/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java
index 66c89348e..1779bc373 100644
--- a/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java
+++ b/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java
@@ -135,9 +135,8 @@ public class ThumbnailGenerator {
};
Runtime.getRuntime().addShutdownHook(shutdownCallback);
- systemMonitorTask =
- TimeoutManager.getInstance().addTimeoutTarget(new SystemMonitorTarget(),
- ComponentUtil.getFessConfig().getThumbnailSystemMonitorIntervalAsInteger(), true);
+ systemMonitorTask = TimeoutManager.getInstance().addTimeoutTarget(new SystemMonitorTarget(),
+ ComponentUtil.getFessConfig().getThumbnailSystemMonitorIntervalAsInteger(), true);
final int totalCount = process(options);
if (totalCount != 0) {
diff --git a/src/main/java/org/codelibs/fess/filter/CorsFilter.java b/src/main/java/org/codelibs/fess/filter/CorsFilter.java
index 414744cd2..93d264243 100644
--- a/src/main/java/org/codelibs/fess/filter/CorsFilter.java
+++ b/src/main/java/org/codelibs/fess/filter/CorsFilter.java
@@ -50,8 +50,8 @@ public class CorsFilter implements Filter {
protected static final String WILDCARD = "*";
@Override
- public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) throws IOException,
- ServletException {
+ public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain)
+ throws IOException, ServletException {
final HttpServletRequest httpRequest = (HttpServletRequest) request;
final String origin = httpRequest.getHeader("Origin");
if (StringUtil.isBlank(origin)) {
diff --git a/src/main/java/org/codelibs/fess/filter/EncodingFilter.java b/src/main/java/org/codelibs/fess/filter/EncodingFilter.java
index 7cba7dd22..a6fd1f05d 100644
--- a/src/main/java/org/codelibs/fess/filter/EncodingFilter.java
+++ b/src/main/java/org/codelibs/fess/filter/EncodingFilter.java
@@ -72,8 +72,8 @@ public class EncodingFilter implements Filter {
}
@Override
- public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) throws IOException,
- ServletException {
+ public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain)
+ throws IOException, ServletException {
final HttpServletRequest req = (HttpServletRequest) request;
final String servletPath = req.getServletPath();
for (final Map.Entry<String, String> entry : encodingMap.entrySet()) {
diff --git a/src/main/java/org/codelibs/fess/filter/WebApiFilter.java b/src/main/java/org/codelibs/fess/filter/WebApiFilter.java
index 00c0b0b81..7c94f622c 100644
--- a/src/main/java/org/codelibs/fess/filter/WebApiFilter.java
+++ b/src/main/java/org/codelibs/fess/filter/WebApiFilter.java
@@ -43,8 +43,8 @@ public class WebApiFilter implements Filter {
}
@Override
- public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) throws IOException,
- ServletException {
+ public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain)
+ throws IOException, ServletException {
final WebApiManagerFactory webApiManagerFactory = ComponentUtil.getWebApiManagerFactory();
final WebApiManager webApiManager = webApiManagerFactory.get((HttpServletRequest) request);
if (webApiManager == null) {
diff --git a/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java
index 45e366f47..284b54436 100644
--- a/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java
@@ -90,7 +90,8 @@ public class CrawlerLogHelper extends LogHelperImpl {
super.log(key, objs);
}
- private void storeFailureUrl(final CrawlerContext crawlerContext, final UrlQueue<?> urlQueue, final String errorName, final Throwable e) {
+ private void storeFailureUrl(final CrawlerContext crawlerContext, final UrlQueue<?> urlQueue, final String errorName,
+ final Throwable e) {
final CrawlingConfig crawlingConfig = getCrawlingConfig(crawlerContext.getSessionId());
final String url = urlQueue.getUrl();
diff --git a/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
index a8d74cdc9..bc1b80a8e 100644
--- a/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
@@ -180,29 +180,26 @@ public class CrawlingInfoHelper {
public List<Map<String, String>> getSessionIdList(final FessEsClient fessEsClient) {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
- return fessEsClient.search(
- fessConfig.getIndexDocumentSearchIndex(),
- queryRequestBuilder -> {
- queryRequestBuilder.setQuery(QueryBuilders.matchAllQuery());
- final TermsAggregationBuilder termsBuilder =
- AggregationBuilders.terms(fessConfig.getIndexFieldSegment()).field(fessConfig.getIndexFieldSegment())
- .size(maxSessionIdsInList).order(BucketOrder.key(false));
- queryRequestBuilder.addAggregation(termsBuilder);
- queryRequestBuilder.setPreference(Constants.SEARCH_PREFERENCE_LOCAL);
- return true;
- }, (queryRequestBuilder, execTime, searchResponse) -> {
- final List<Map<String, String>> sessionIdList = new ArrayList<>();
- searchResponse.ifPresent(response -> {
- final Terms terms = response.getAggregations().get(fessConfig.getIndexFieldSegment());
- for (final Bucket bucket : terms.getBuckets()) {
- final Map<String, String> map = new HashMap<>(2);
- map.put(fessConfig.getIndexFieldSegment(), bucket.getKey().toString());
- map.put(FACET_COUNT_KEY, Long.toString(bucket.getDocCount()));
- sessionIdList.add(map);
- }
- });
- return sessionIdList;
- });
+ return fessEsClient.search(fessConfig.getIndexDocumentSearchIndex(), queryRequestBuilder -> {
+ queryRequestBuilder.setQuery(QueryBuilders.matchAllQuery());
+ final TermsAggregationBuilder termsBuilder = AggregationBuilders.terms(fessConfig.getIndexFieldSegment())
+ .field(fessConfig.getIndexFieldSegment()).size(maxSessionIdsInList).order(BucketOrder.key(false));
+ queryRequestBuilder.addAggregation(termsBuilder);
+ queryRequestBuilder.setPreference(Constants.SEARCH_PREFERENCE_LOCAL);
+ return true;
+ }, (queryRequestBuilder, execTime, searchResponse) -> {
+ final List<Map<String, String>> sessionIdList = new ArrayList<>();
+ searchResponse.ifPresent(response -> {
+ final Terms terms = response.getAggregations().get(fessConfig.getIndexFieldSegment());
+ for (final Bucket bucket : terms.getBuckets()) {
+ final Map<String, String> map = new HashMap<>(2);
+ map.put(fessConfig.getIndexFieldSegment(), bucket.getKey().toString());
+ map.put(FACET_COUNT_KEY, Long.toString(bucket.getDocCount()));
+ sessionIdList.add(map);
+ }
+ });
+ return sessionIdList;
+ });
}
protected String generateId(final String urlId) {
diff --git a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
index a2edf0dd9..6e9a33494 100644
--- a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
@@ -236,9 +236,7 @@ public class DataIndexHelper {
}
final FessConfig fessConfig = ComponentUtil.getFessConfig();
final QueryBuilder queryBuilder =
- QueryBuilders
- .boolQuery()
- .must(QueryBuilders.termQuery(fessConfig.getIndexFieldConfigId(), dataConfig.getConfigId()))
+ QueryBuilders.boolQuery().must(QueryBuilders.termQuery(fessConfig.getIndexFieldConfigId(), dataConfig.getConfigId()))
.must(QueryBuilders.boolQuery().mustNot(QueryBuilders.rangeQuery(fessConfig.getIndexFieldExpires()).gt("now"))
.mustNot(QueryBuilders.existsQuery(fessConfig.getIndexFieldExpires())))
.mustNot(QueryBuilders.termQuery(fessConfig.getIndexFieldSegment(), sessionId));
diff --git a/src/main/java/org/codelibs/fess/helper/FileTypeHelper.java b/src/main/java/org/codelibs/fess/helper/FileTypeHelper.java
index 1a68f1850..dfcb4ac5b 100644
--- a/src/main/java/org/codelibs/fess/helper/FileTypeHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/FileTypeHelper.java
@@ -36,8 +36,8 @@ public class FileTypeHelper {
@PostConstruct
public void init() {
- StreamUtil.split(ComponentUtil.getFessConfig().getIndexFiletype(), "\n").of(
- stream -> stream.filter(StringUtil::isNotBlank).forEach(s -> {
+ StreamUtil.split(ComponentUtil.getFessConfig().getIndexFiletype(), "\n")
+ .of(stream -> stream.filter(StringUtil::isNotBlank).forEach(s -> {
final String[] values = StringUtils.split(s, "=", 2);
if (values.length == 2) {
mimetypeMap.put(values[0], values[1]);
diff --git a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
index 75e8cbb1c..813ebaa0a 100644
--- a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
@@ -57,16 +57,15 @@ public class IndexingHelper {
try {
if (fessConfig.isThumbnailCrawlerEnabled()) {
final ThumbnailManager thumbnailManager = ComponentUtil.getThumbnailManager();
- docList.stream().forEach(
- doc -> {
- if (!thumbnailManager.offer(doc)) {
- if (logger.isDebugEnabled()) {
- logger.debug("Removing {} from {}", doc.get(fessConfig.getIndexFieldThumbnail()),
- doc.get(fessConfig.getIndexFieldUrl()));
- }
- doc.remove(fessConfig.getIndexFieldThumbnail());
- }
- });
+ docList.stream().forEach(doc -> {
+ if (!thumbnailManager.offer(doc)) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Removing {} from {}", doc.get(fessConfig.getIndexFieldThumbnail()),
+ doc.get(fessConfig.getIndexFieldUrl()));
+ }
+ doc.remove(fessConfig.getIndexFieldThumbnail());
+ }
+ });
}
final CrawlingConfigHelper crawlingConfigHelper = ComponentUtil.getCrawlingConfigHelper();
synchronized (fessEsClient) {
@@ -106,14 +105,12 @@ public class IndexingHelper {
continue;
}
- final QueryBuilder queryBuilder =
- QueryBuilders.boolQuery()
- .must(QueryBuilders.termQuery(fessConfig.getIndexFieldUrl(), inputDoc.get(fessConfig.getIndexFieldUrl())))
- .filter(QueryBuilders.termQuery(fessConfig.getIndexFieldConfigId(), configIdValue));
+ final QueryBuilder queryBuilder = QueryBuilders.boolQuery()
+ .must(QueryBuilders.termQuery(fessConfig.getIndexFieldUrl(), inputDoc.get(fessConfig.getIndexFieldUrl())))
+ .filter(QueryBuilders.termQuery(fessConfig.getIndexFieldConfigId(), configIdValue));
- final List<Map<String, Object>> docs =
- getDocumentListByQuery(fessEsClient, queryBuilder,
- new String[] { fessConfig.getIndexFieldId(), fessConfig.getIndexFieldDocId() });
+ final List<Map<String, Object>> docs = getDocumentListByQuery(fessEsClient, queryBuilder,
+ new String[] { fessConfig.getIndexFieldId(), fessConfig.getIndexFieldDocId() });
for (final Map<String, Object> doc : docs) {
final Object oldIdValue = doc.get(fessConfig.getIndexFieldId());
if (!idValue.equals(oldIdValue) && oldIdValue != null) {
@@ -192,9 +189,8 @@ public class IndexingHelper {
final String[] fields) {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
- final SearchResponse countResponse =
- fessEsClient.prepareSearch(fessConfig.getIndexDocumentUpdateIndex()).setQuery(queryBuilder).setSize(0).execute()
- .actionGet(fessConfig.getIndexSearchTimeout());
+ final SearchResponse countResponse = fessEsClient.prepareSearch(fessConfig.getIndexDocumentUpdateIndex()).setQuery(queryBuilder)
+ .setSize(0).execute().actionGet(fessConfig.getIndexSearchTimeout());
final long numFound = countResponse.getHits().getTotalHits().value;
// TODO max threshold
diff --git a/src/main/java/org/codelibs/fess/helper/JobHelper.java b/src/main/java/org/codelibs/fess/helper/JobHelper.java
index 8f8702063..c241dbcd7 100644
--- a/src/main/java/org/codelibs/fess/helper/JobHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/JobHelper.java
@@ -71,15 +71,14 @@ public class JobHelper {
}
final FessConfig fessConfig = ComponentUtil.getFessConfig();
- final CronParamsSupplier paramsOp =
- () -> {
- final Map<String, Object> params = new HashMap<>();
- ComponentUtil.getComponent(ScheduledJobBhv.class).selectByPK(scheduledJob.getId())
- .ifPresent(e -> params.put(Constants.SCHEDULED_JOB, e)).orElse(() -> {
- logger.warn("Job {} is not found.", scheduledJob.getId());
- });
- return params;
- };
+ final CronParamsSupplier paramsOp = () -> {
+ final Map<String, Object> params = new HashMap<>();
+ ComponentUtil.getComponent(ScheduledJobBhv.class).selectByPK(scheduledJob.getId())
+ .ifPresent(e -> params.put(Constants.SCHEDULED_JOB, e)).orElse(() -> {
+ logger.warn("Job {} is not found.", scheduledJob.getId());
+ });
+ return params;
+ };
findJobByUniqueOf(LaJobUnique.of(id)).ifPresent(job -> {
if (!job.isUnscheduled()) {
if (StringUtil.isNotBlank(scheduledJob.getCronExpression())) {
@@ -95,20 +94,18 @@ public class JobHelper {
final String cronExpression = scheduledJob.getCronExpression();
job.reschedule(cronExpression, op -> op.changeNoticeLogToDebug().params(paramsOp));
}
- }).orElse(
- () -> {
- if (StringUtil.isNotBlank(scheduledJob.getCronExpression())) {
- logger.info("Starting Job {}:{}", id, scheduledJob.getName());
- final String cronExpression = scheduledJob.getCronExpression();
- cron.register(cronExpression, fessConfig.getSchedulerJobClassAsClass(),
- fessConfig.getSchedulerConcurrentExecModeAsEnum(),
- op -> op.uniqueBy(id).changeNoticeLogToDebug().params(paramsOp));
- } else {
- logger.info("Inactive Job {}:{}", id, scheduledJob.getName());
- cron.registerNonCron(fessConfig.getSchedulerJobClassAsClass(), fessConfig.getSchedulerConcurrentExecModeAsEnum(),
- op -> op.uniqueBy(id).changeNoticeLogToDebug().params(paramsOp));
- }
- });
+ }).orElse(() -> {
+ if (StringUtil.isNotBlank(scheduledJob.getCronExpression())) {
+ logger.info("Starting Job {}:{}", id, scheduledJob.getName());
+ final String cronExpression = scheduledJob.getCronExpression();
+ cron.register(cronExpression, fessConfig.getSchedulerJobClassAsClass(), fessConfig.getSchedulerConcurrentExecModeAsEnum(),
+ op -> op.uniqueBy(id).changeNoticeLogToDebug().params(paramsOp));
+ } else {
+ logger.info("Inactive Job {}:{}", id, scheduledJob.getName());
+ cron.registerNonCron(fessConfig.getSchedulerJobClassAsClass(), fessConfig.getSchedulerConcurrentExecModeAsEnum(),
+ op -> op.uniqueBy(id).changeNoticeLogToDebug().params(paramsOp));
+ }
+ });
}
private OptionalThing<LaScheduledJob> findJobByUniqueOf(final LaJobUnique jobUnique) {
diff --git a/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java b/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
index 3aa682798..069ceedb0 100644
--- a/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
@@ -74,52 +74,50 @@ public class KeyMatchHelper {
protected void reload(final long interval) {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
final Map<String, Map<String, Pair<QueryBuilder, ScoreFunctionBuilder<?>>>> keyMatchQueryMap = new HashMap<>();
- getAvailableKeyMatchList().stream().forEach(
- keyMatch -> {
- final BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
- if (logger.isDebugEnabled()) {
- logger.debug("Loading KeyMatch Query: {}, Size: {}", keyMatch.getQuery(), keyMatch.getMaxSize());
- }
- getDocumentList(keyMatch).stream().map(doc -> {
- if (logger.isDebugEnabled()) {
- logger.debug("Loaded KeyMatch doc: {}", doc);
- }
- return DocumentUtil.getValue(doc, fessConfig.getIndexFieldDocId(), String.class);
- }).forEach(docId -> {
- boolQuery.should(QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), docId));
- });
-
- if (boolQuery.hasClauses()) {
- if (logger.isDebugEnabled()) {
- logger.debug("Loaded KeyMatch Boost Query: {}", boolQuery);
- }
- String virtualHost = keyMatch.getVirtualHost();
- if (StringUtil.isBlank(virtualHost)) {
- virtualHost = StringUtil.EMPTY;
- }
- Map<String, Pair<QueryBuilder, ScoreFunctionBuilder<?>>> queryMap = keyMatchQueryMap.get(virtualHost);
- if (queryMap == null) {
- queryMap = new HashMap<>();
- keyMatchQueryMap.put(virtualHost, queryMap);
- }
- queryMap.put(toLowerCase(keyMatch.getTerm()),
- new Pair<>(boolQuery, ScoreFunctionBuilders.weightFactorFunction(keyMatch.getBoost())));
- } else if (logger.isDebugEnabled()) {
- logger.debug("No KeyMatch boost docs");
- }
-
- if (interval > 0) {
- ThreadUtil.sleep(interval);
- }
- });
+ getAvailableKeyMatchList().stream().forEach(keyMatch -> {
+ final BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
+ if (logger.isDebugEnabled()) {
+ logger.debug("Loading KeyMatch Query: {}, Size: {}", keyMatch.getQuery(), keyMatch.getMaxSize());
+ }
+ getDocumentList(keyMatch).stream().map(doc -> {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Loaded KeyMatch doc: {}", doc);
+ }
+ return DocumentUtil.getValue(doc, fessConfig.getIndexFieldDocId(), String.class);
+ }).forEach(docId -> {
+ boolQuery.should(QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), docId));
+ });
+
+ if (boolQuery.hasClauses()) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Loaded KeyMatch Boost Query: {}", boolQuery);
+ }
+ String virtualHost = keyMatch.getVirtualHost();
+ if (StringUtil.isBlank(virtualHost)) {
+ virtualHost = StringUtil.EMPTY;
+ }
+ Map<String, Pair<QueryBuilder, ScoreFunctionBuilder<?>>> queryMap = keyMatchQueryMap.get(virtualHost);
+ if (queryMap == null) {
+ queryMap = new HashMap<>();
+ keyMatchQueryMap.put(virtualHost, queryMap);
+ }
+ queryMap.put(toLowerCase(keyMatch.getTerm()),
+ new Pair<>(boolQuery, ScoreFunctionBuilders.weightFactorFunction(keyMatch.getBoost())));
+ } else if (logger.isDebugEnabled()) {
+ logger.debug("No KeyMatch boost docs");
+ }
+
+ if (interval > 0) {
+ ThreadUtil.sleep(interval);
+ }
+ });
this.keyMatchQueryMap = keyMatchQueryMap;
}
protected List<Map<String, Object>> getDocumentList(final KeyMatch keyMatch) {
final FessEsClient fessEsClient = ComponentUtil.getFessEsClient();
final FessConfig fessConfig = ComponentUtil.getFessConfig();
- return fessEsClient.getDocumentList(
- fessConfig.getIndexDocumentSearchIndex(),
+ return fessEsClient.getDocumentList(fessConfig.getIndexDocumentSearchIndex(),
searchRequestBuilder -> SearchConditionBuilder
.builder(searchRequestBuilder.setPreference(Constants.SEARCH_PREFERENCE_LOCAL))
.searchRequestType(SearchRequestType.ADMIN_SEARCH).size(keyMatch.getMaxSize()).query(keyMatch.getQuery())
diff --git a/src/main/java/org/codelibs/fess/helper/LanguageHelper.java b/src/main/java/org/codelibs/fess/helper/LanguageHelper.java
index 5bb97cd59..ee4dc6247 100644
--- a/src/main/java/org/codelibs/fess/helper/LanguageHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/LanguageHelper.java
@@ -142,9 +142,8 @@ public class LanguageHelper {
public String getReindexScriptSource() {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
final String langField = fessConfig.getIndexFieldLang();
- final String code =
- Arrays.stream(langFields).map(s -> "ctx._source['" + s + "_'+ctx._source." + langField + "]=ctx._source." + s)
- .collect(Collectors.joining(";"));
+ final String code = Arrays.stream(langFields).map(s -> "ctx._source['" + s + "_'+ctx._source." + langField + "]=ctx._source." + s)
+ .collect(Collectors.joining(";"));
if (logger.isDebugEnabled()) {
logger.debug("reindex script: {}", code);
}
diff --git a/src/main/java/org/codelibs/fess/helper/NotificationHelper.java b/src/main/java/org/codelibs/fess/helper/NotificationHelper.java
index bad01eab6..6a076cdc9 100644
--- a/src/main/java/org/codelibs/fess/helper/NotificationHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/NotificationHelper.java
@@ -47,22 +47,20 @@ public class NotificationHelper {
return;
}
final String body = toSlackMessage(discloser);
- StreamUtil.split(slackWebhookUrls, "[,\\s]").of(
- stream -> stream.filter(StringUtil::isNotBlank).forEach(
- url -> {
- try (CurlResponse response = Curl.post(url).header("Content-Type", "application/json").body(body).execute()) {
- if (response.getHttpStatusCode() == 200) {
- if (logger.isDebugEnabled()) {
- logger.debug("Sent {} to {}.", body, url);
- }
- } else {
- logger.warn("Failed to send {} to {}. HTTP Status is {}. {}", body, url, response.getHttpStatusCode(),
- response.getContentAsString());
- }
- } catch (final IOException e) {
- logger.warn("Failed to send {} to {}.", body, url, e);
- }
- }));
+ StreamUtil.split(slackWebhookUrls, "[,\\s]").of(stream -> stream.filter(StringUtil::isNotBlank).forEach(url -> {
+ try (CurlResponse response = Curl.post(url).header("Content-Type", "application/json").body(body).execute()) {
+ if (response.getHttpStatusCode() == 200) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Sent {} to {}.", body, url);
+ }
+ } else {
+ logger.warn("Failed to send {} to {}. HTTP Status is {}. {}", body, url, response.getHttpStatusCode(),
+ response.getContentAsString());
+ }
+ } catch (final IOException e) {
+ logger.warn("Failed to send {} to {}.", body, url, e);
+ }
+ }));
}
protected String toSlackMessage(final SMailPostingDiscloser discloser) {
@@ -84,22 +82,20 @@ public class NotificationHelper {
return;
}
final String body = toGoogleChatMessage(discloser);
- StreamUtil.split(googleChatWebhookUrls, "[,\\s]").of(
- stream -> stream.filter(StringUtil::isNotBlank).forEach(
- url -> {
- try (CurlResponse response = Curl.post(url).header("Content-Type", "application/json").body(body).execute()) {
- if (response.getHttpStatusCode() == 200) {
- if (logger.isDebugEnabled()) {
- logger.debug("Sent {} to {}.", body, url);
- }
- } else {
- logger.warn("Failed to send {} to {}. HTTP Status is {}. {}", body, url, response.getHttpStatusCode(),
- response.getContentAsString());
- }
- } catch (final IOException e) {
- logger.warn("Failed to send {} to {}.", body, url, e);
- }
- }));
+ StreamUtil.split(googleChatWebhookUrls, "[,\\s]").of(stream -> stream.filter(StringUtil::isNotBlank).forEach(url -> {
+ try (CurlResponse response = Curl.post(url).header("Content-Type", "application/json").body(body).execute()) {
+ if (response.getHttpStatusCode() == 200) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Sent {} to {}.", body, url);
+ }
+ } else {
+ logger.warn("Failed to send {} to {}. HTTP Status is {}. {}", body, url, response.getHttpStatusCode(),
+ response.getContentAsString());
+ }
+ } catch (final IOException e) {
+ logger.warn("Failed to send {} to {}.", body, url, e);
+ }
+ }));
}
protected String toGoogleChatMessage(final SMailPostingDiscloser discloser) {
diff --git a/src/main/java/org/codelibs/fess/helper/PluginHelper.java b/src/main/java/org/codelibs/fess/helper/PluginHelper.java
index fb1b87eb8..10b740fb7 100644
--- a/src/main/java/org/codelibs/fess/helper/PluginHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/PluginHelper.java
@@ -92,8 +92,8 @@ public class PluginHelper {
}
protected String[] getRepositories() {
- return split(ComponentUtil.getFessConfig().getPluginRepositories(), ",").get(
- stream -> stream.map(String::trim).toArray(n -> new String[n]));
+ return split(ComponentUtil.getFessConfig().getPluginRepositories(), ",")
+ .get(stream -> stream.map(String::trim).toArray(n -> new String[n]));
}
protected List<Artifact> loadArtifactsFromRepository(final String url) {
@@ -133,7 +133,8 @@ public class PluginHelper {
final String snapshotVersion = getSnapshotActualVersion(builder, pluginUrl, version);
if (StringUtil.isNotBlank(snapshotVersion)) {
final String actualVersion = version.replace("SNAPSHOT", snapshotVersion);
- list.add(new Artifact(name, actualVersion, pluginUrl + version + "/" + name + "-" + actualVersion + ".jar"));
+ list.add(
+ new Artifact(name, actualVersion, pluginUrl + version + "/" + name + "-" + actualVersion + ".jar"));
} else if (logger.isDebugEnabled()) {
logger.debug("Snapshot name is not found: {}/{}", name, version);
}
diff --git a/src/main/java/org/codelibs/fess/helper/PopularWordHelper.java b/src/main/java/org/codelibs/fess/helper/PopularWordHelper.java
index bac01836a..e77e6f453 100644
--- a/src/main/java/org/codelibs/fess/helper/PopularWordHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/PopularWordHelper.java
@@ -52,44 +52,40 @@ public class PopularWordHelper {
logger.debug("Initialize {}", this.getClass().getSimpleName());
}
fessConfig = ComponentUtil.getFessConfig();
- cache =
- CacheBuilder.newBuilder().maximumSize(fessConfig.getSuggestPopularWordCacheSizeAsInteger().longValue())
- .expireAfterWrite(fessConfig.getSuggestPopularWordCacheExpireAsInteger().longValue(), TimeUnit.MINUTES).build();
+ cache = CacheBuilder.newBuilder().maximumSize(fessConfig.getSuggestPopularWordCacheSizeAsInteger().longValue())
+ .expireAfterWrite(fessConfig.getSuggestPopularWordCacheExpireAsInteger().longValue(), TimeUnit.MINUTES).build();
}
- public List<String> getWordList(final SearchRequestType searchRequestType, final String seed, final String[] tags,
- final String[] roles, final String[] fields, final String[] excludes) {
+ public List<String> getWordList(final SearchRequestType searchRequestType, final String seed, final String[] tags, final String[] roles,
+ final String[] fields, final String[] excludes) {
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(searchRequestType).stream().filter(StringUtil::isNotBlank)
+ final String[] baseRoles = roles != null ? roles
+ : ComponentUtil.getRoleQueryHelper().build(searchRequestType).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();
try {
- return cache.get(
- getCacheKey(baseSeed, baseTags, baseRoles, baseFields, baseExcludes),
- () -> {
- final List<String> wordList = new ArrayList<>();
- final SuggestHelper suggestHelper = ComponentUtil.getSuggestHelper();
- final PopularWordsRequestBuilder popularWordsRequestBuilder =
- suggestHelper.suggester().popularWords().setSize(fessConfig.getSuggestPopularWordSizeAsInteger())
- .setWindowSize(fessConfig.getSuggestPopularWordWindowSizeAsInteger())
- .setQueryFreqThreshold(fessConfig.getSuggestPopularWordQueryFreqAsInteger());
- popularWordsRequestBuilder.setSeed(baseSeed);
- stream(baseTags).of(stream -> stream.forEach(tag -> popularWordsRequestBuilder.addTag(tag)));
- stream(baseRoles).of(stream -> stream.forEach(role -> popularWordsRequestBuilder.addRole(role)));
- stream(baseFields).of(stream -> stream.forEach(field -> popularWordsRequestBuilder.addField(field)));
- stream(baseExcludes).of(stream -> stream.forEach(exclude -> popularWordsRequestBuilder.addExcludeWord(exclude)));
- try {
- popularWordsRequestBuilder.execute().getResponse().getItems().stream()
- .forEach(item -> wordList.add(item.getText()));
- } catch (final SuggesterException e) {
- logger.warn("Failed to generate popular words.", e);
- }
+ return cache.get(getCacheKey(baseSeed, baseTags, baseRoles, baseFields, baseExcludes), () -> {
+ final List<String> wordList = new ArrayList<>();
+ final SuggestHelper suggestHelper = ComponentUtil.getSuggestHelper();
+ final PopularWordsRequestBuilder popularWordsRequestBuilder =
+ suggestHelper.suggester().popularWords().setSize(fessConfig.getSuggestPopularWordSizeAsInteger())
+ .setWindowSize(fessConfig.getSuggestPopularWordWindowSizeAsInteger())
+ .setQueryFreqThreshold(fessConfig.getSuggestPopularWordQueryFreqAsInteger());
+ popularWordsRequestBuilder.setSeed(baseSeed);
+ stream(baseTags).of(stream -> stream.forEach(tag -> popularWordsRequestBuilder.addTag(tag)));
+ stream(baseRoles).of(stream -> stream.forEach(role -> popularWordsRequestBuilder.addRole(role)));
+ stream(baseFields).of(stream -> stream.forEach(field -> popularWordsRequestBuilder.addField(field)));
+ stream(baseExcludes).of(stream -> stream.forEach(exclude -> popularWordsRequestBuilder.addExcludeWord(exclude)));
+ try {
+ popularWordsRequestBuilder.execute().getResponse().getItems().stream().forEach(item -> wordList.add(item.getText()));
+ } catch (final SuggesterException e) {
+ logger.warn("Failed to generate popular words.", e);
+ }
- return wordList;
- });
+ return wordList;
+ });
} catch (final ExecutionException e) {
logger.warn("Failed to load popular words.", e);
}
diff --git a/src/main/java/org/codelibs/fess/helper/QueryHelper.java b/src/main/java/org/codelibs/fess/helper/QueryHelper.java
index c035f75bf..49cf5c8e0 100644
--- a/src/main/java/org/codelibs/fess/helper/QueryHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/QueryHelper.java
@@ -320,8 +320,8 @@ public class QueryHelper {
fessConfig.getIndexFieldUrl(), //
fessConfig.getIndexFieldVersion()));
}
- split(fessConfig.getQueryAdditionalAnalyzedFields(), ",").of(
- stream -> stream.map(String::trim).filter(StringUtil::isNotBlank).forEach(s -> notAnalyzedFieldSet.remove(s)));
+ split(fessConfig.getQueryAdditionalAnalyzedFields(), ",")
+ .of(stream -> stream.map(String::trim).filter(StringUtil::isNotBlank).forEach(s -> notAnalyzedFieldSet.remove(s)));
split(fessConfig.getQueryAdditionalDefaultFields(), ",").of(stream -> stream.filter(StringUtil::isNotBlank).map(s -> {
final Pair<String, Float> pair = new Pair<>();
final String[] values = s.split(":");
@@ -395,8 +395,8 @@ public class QueryHelper {
protected void buildBoostQuery(final QueryContext queryContext) {
queryContext.addFunctionScore(list -> {
- list.add(new FilterFunctionBuilder(ScoreFunctionBuilders.fieldValueFactorFunction(ComponentUtil.getFessConfig()
- .getIndexFieldBoost())));
+ list.add(new FilterFunctionBuilder(
+ ScoreFunctionBuilders.fieldValueFactorFunction(ComponentUtil.getFessConfig().getIndexFieldBoost())));
ComponentUtil.getKeyMatchHelper().buildQuery(queryContext.getDefaultKeyword(), list);
list.addAll(boostFunctionList);
});
@@ -445,8 +445,8 @@ public class QueryHelper {
final BoostQuery boostQuery = (BoostQuery) query;
return convertQuery(context, boostQuery.getQuery(), boostQuery.getBoost());
}
- throw new InvalidQueryException(messages -> messages.addErrorsInvalidQueryUnknown(UserMessages.GLOBAL_PROPERTY_KEY), "Unknown q: "
- + query.getClass() + " => " + query);
+ throw new InvalidQueryException(messages -> messages.addErrorsInvalidQueryUnknown(UserMessages.GLOBAL_PROPERTY_KEY),
+ "Unknown q: " + query.getClass() + " => " + query);
}
protected QueryBuilder convertBooleanQuery(final QueryContext context, final BooleanQuery booleanQuery, final float boost) {
@@ -493,8 +493,8 @@ public class QueryHelper {
final String field = getSearchField(context, wildcardQuery.getField());
if (Constants.DEFAULT_FIELD.equals(field)) {
context.addFieldLog(field, wildcardQuery.getTerm().text());
- return buildDefaultQueryBuilder((f, b) -> QueryBuilders.wildcardQuery(f, toLowercaseWildcard(wildcardQuery.getTerm().text()))
- .boost(b * boost));
+ return buildDefaultQueryBuilder(
+ (f, b) -> QueryBuilders.wildcardQuery(f, toLowercaseWildcard(wildcardQuery.getTerm().text())).boost(b * boost));
} else if (isSearchField(field)) {
context.addFieldLog(field, wildcardQuery.getTerm().text());
return QueryBuilders.wildcardQuery(field, toLowercaseWildcard(wildcardQuery.getTerm().text())).boost(boost);
@@ -511,8 +511,8 @@ public class QueryHelper {
final String field = getSearchField(context, prefixQuery.getField());
if (Constants.DEFAULT_FIELD.equals(field)) {
context.addFieldLog(field, prefixQuery.getPrefix().text());
- return buildDefaultQueryBuilder((f, b) -> QueryBuilders.matchPhrasePrefixQuery(f,
- toLowercaseWildcard(prefixQuery.getPrefix().text())).boost(b * boost));
+ return buildDefaultQueryBuilder((f, b) -> QueryBuilders
+ .matchPhrasePrefixQuery(f, toLowercaseWildcard(prefixQuery.getPrefix().text())).boost(b * boost));
} else if (isSearchField(field)) {
context.addFieldLog(field, prefixQuery.getPrefix().text());
if (notAnalyzedFieldSet.contains(field)) {
@@ -609,34 +609,35 @@ public class QueryHelper {
context.addHighlightedQuery(text);
return buildDefaultQueryBuilder((f, b) -> buildMatchPhraseQuery(f, text).boost(b * boost));
} else if ("sort".equals(field)) {
- split(text, ",").of(
- stream -> stream.filter(StringUtil::isNotBlank).forEach(
- t -> {
- final String[] values = t.split("\\.");
- if (values.length > 2) {
- throw new InvalidQueryException(messages -> messages.addErrorsInvalidQuerySortValue(
- UserMessages.GLOBAL_PROPERTY_KEY, text), "Invalid sort field: " + termQuery);
- }
- final String sortField = values[0];
- if (!isSortField(sortField)) {
- throw new InvalidQueryException(messages -> messages.addErrorsInvalidQueryUnsupportedSortField(
- UserMessages.GLOBAL_PROPERTY_KEY, sortField), "Unsupported sort field: " + termQuery);
- }
- SortOrder sortOrder;
- if (values.length == 2) {
- sortOrder = SortOrder.DESC.toString().equalsIgnoreCase(values[1]) ? SortOrder.DESC : SortOrder.ASC;
- if (sortOrder == null) {
- throw new InvalidQueryException(messages -> messages.addErrorsInvalidQueryUnsupportedSortOrder(
- UserMessages.GLOBAL_PROPERTY_KEY, values[1]), "Invalid sort order: " + termQuery);
- }
- } else {
- sortOrder = SortOrder.ASC;
- }
- context.addSorts(createFieldSortBuilder(sortField, sortOrder));
- }));
+ split(text, ",").of(stream -> stream.filter(StringUtil::isNotBlank).forEach(t -> {
+ final String[] values = t.split("\\.");
+ if (values.length > 2) {
+ throw new InvalidQueryException(
+ messages -> messages.addErrorsInvalidQuerySortValue(UserMessages.GLOBAL_PROPERTY_KEY, text),
+ "Invalid sort field: " + termQuery);
+ }
+ final String sortField = values[0];
+ if (!isSortField(sortField)) {
+ throw new InvalidQueryException(
+ messages -> messages.addErrorsInvalidQueryUnsupportedSortField(UserMessages.GLOBAL_PROPERTY_KEY, sortField),
+ "Unsupported sort field: " + termQuery);
+ }
+ SortOrder sortOrder;
+ if (values.length == 2) {
+ sortOrder = SortOrder.DESC.toString().equalsIgnoreCase(values[1]) ? SortOrder.DESC : SortOrder.ASC;
+ if (sortOrder == null) {
+ throw new InvalidQueryException(
+ messages -> messages.addErrorsInvalidQueryUnsupportedSortOrder(UserMessages.GLOBAL_PROPERTY_KEY, values[1]),
+ "Invalid sort order: " + termQuery);
+ }
+ } else {
+ sortOrder = SortOrder.ASC;
+ }
+ context.addSorts(createFieldSortBuilder(sortField, sortOrder));
+ }));
return null;
- } else if (INURL_FIELD.equals(field)
- || (StringUtil.equals(field, context.getDefaultField()) && fessConfig.getIndexFieldUrl().equals(context.getDefaultField()))) {
+ } else if (INURL_FIELD.equals(field) || (StringUtil.equals(field, context.getDefaultField())
+ && fessConfig.getIndexFieldUrl().equals(context.getDefaultField()))) {
return QueryBuilders.wildcardQuery(fessConfig.getIndexFieldUrl(), "*" + text + "*").boost(boost);
} else if (SITE_FIELD.equals(field)) {
return convertSiteQuery(context, text, boost);
@@ -692,18 +693,14 @@ public class QueryHelper {
final QueryBuilder contentQuery =
builder.apply(fessConfig.getIndexFieldContent(), fessConfig.getQueryBoostContentAsDecimal().floatValue());
boolQuery.should(contentQuery);
- getQueryLanguages().ifPresent(
- langs -> stream(langs).of(
- stream -> stream.forEach(lang -> {
- final QueryBuilder titleLangQuery =
- builder.apply(fessConfig.getIndexFieldTitle() + "_" + lang, fessConfig
- .getQueryBoostTitleLangAsDecimal().floatValue());
- boolQuery.should(titleLangQuery);
- final QueryBuilder contentLangQuery =
- builder.apply(fessConfig.getIndexFieldContent() + "_" + lang, fessConfig
- .getQueryBoostContentLangAsDecimal().floatValue());
- boolQuery.should(contentLangQuery);
- })));
+ getQueryLanguages().ifPresent(langs -> stream(langs).of(stream -> stream.forEach(lang -> {
+ final QueryBuilder titleLangQuery =
+ builder.apply(fessConfig.getIndexFieldTitle() + "_" + lang, fessConfig.getQueryBoostTitleLangAsDecimal().floatValue());
+ boolQuery.should(titleLangQuery);
+ final QueryBuilder contentLangQuery = builder.apply(fessConfig.getIndexFieldContent() + "_" + lang,
+ fessConfig.getQueryBoostContentLangAsDecimal().floatValue());
+ boolQuery.should(contentLangQuery);
+ })));
additionalDefaultList.stream().forEach(f -> {
final QueryBuilder query = builder.apply(f.getFirst(), f.getSecond());
boolQuery.should(query);
@@ -716,9 +713,8 @@ public class QueryHelper {
}
protected OptionalThing<String[]> getQueryLanguages() {
- return LaRequestUtil.getOptionalRequest().map(
- request -> ComponentUtil.getFessConfig().getQueryLanguages(request.getLocales(),
- (String[]) request.getAttribute(Constants.REQUEST_LANGUAGES)));
+ return LaRequestUtil.getOptionalRequest().map(request -> ComponentUtil.getFessConfig().getQueryLanguages(request.getLocales(),
+ (String[]) request.getAttribute(Constants.REQUEST_LANGUAGES)));
}
protected boolean isSortField(final String field) {
diff --git a/src/main/java/org/codelibs/fess/helper/SearchHelper.java b/src/main/java/org/codelibs/fess/helper/SearchHelper.java
index 17480e790..782706d63 100644
--- a/src/main/java/org/codelibs/fess/helper/SearchHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SearchHelper.java
@@ -93,29 +93,27 @@ public class SearchHelper {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
final QueryHelper queryHelper = ComponentUtil.getQueryHelper();
final List<Map<String, Object>> documentItems =
- ComponentUtil.getFessEsClient().search(
- fessConfig.getIndexDocumentSearchIndex(),
- searchRequestBuilder -> {
- queryHelper.processSearchPreference(searchRequestBuilder, userBean, query);
- return SearchConditionBuilder.builder(searchRequestBuilder).query(query).offset(pageStart).size(pageSize)
- .facetInfo(params.getFacetInfo()).geoInfo(params.getGeoInfo()).highlightInfo(params.getHighlightInfo())
- .similarDocHash(params.getSimilarDocHash()).responseFields(queryHelper.getResponseFields())
- .searchRequestType(params.getType()).trackTotalHits(params.getTrackTotalHits()).build();
- }, (searchRequestBuilder, execTime, searchResponse) -> {
- searchResponse.ifPresent(r -> {
- if (r.getTotalShards() != r.getSuccessfulShards() && fessConfig.isQueryTimeoutLogging()) {
- // partial results
- final StringBuilder buf = new StringBuilder(1000);
- buf.append("[SEARCH TIMEOUT] {\"exec_time\":").append(execTime)//
- .append(",\"request\":").append(searchRequestBuilder.toString())//
- .append(",\"response\":").append(r.toString()).append('}');
- logger.warn(buf.toString());
- }
- });
- final QueryResponseList queryResponseList = ComponentUtil.getQueryResponseList();
- queryResponseList.init(searchResponse, pageStart, pageSize);
- return queryResponseList;
- });
+ ComponentUtil.getFessEsClient().search(fessConfig.getIndexDocumentSearchIndex(), searchRequestBuilder -> {
+ queryHelper.processSearchPreference(searchRequestBuilder, userBean, query);
+ return SearchConditionBuilder.builder(searchRequestBuilder).query(query).offset(pageStart).size(pageSize)
+ .facetInfo(params.getFacetInfo()).geoInfo(params.getGeoInfo()).highlightInfo(params.getHighlightInfo())
+ .similarDocHash(params.getSimilarDocHash()).responseFields(queryHelper.getResponseFields())
+ .searchRequestType(params.getType()).trackTotalHits(params.getTrackTotalHits()).build();
+ }, (searchRequestBuilder, execTime, searchResponse) -> {
+ searchResponse.ifPresent(r -> {
+ if (r.getTotalShards() != r.getSuccessfulShards() && fessConfig.isQueryTimeoutLogging()) {
+ // partial results
+ final StringBuilder buf = new StringBuilder(1000);
+ buf.append("[SEARCH TIMEOUT] {\"exec_time\":").append(execTime)//
+ .append(",\"request\":").append(searchRequestBuilder.toString())//
+ .append(",\"response\":").append(r.toString()).append('}');
+ logger.warn(buf.toString());
+ }
+ });
+ final QueryResponseList queryResponseList = ComponentUtil.getQueryResponseList();
+ queryResponseList.init(searchResponse, pageStart, pageSize);
+ return queryResponseList;
+ });
data.setDocumentItems(documentItems);
// search
@@ -191,15 +189,13 @@ public class SearchHelper {
query = ComponentUtil.getQueryStringBuilder().params(params).build() + " sort:" + sortField;
}
final FessConfig fessConfig = ComponentUtil.getFessConfig();
- return ComponentUtil.getFessEsClient().<Map<String, Object>> scrollSearch(
- fessConfig.getIndexDocumentSearchIndex(),
+ return ComponentUtil.getFessEsClient().<Map<String, Object>> scrollSearch(fessConfig.getIndexDocumentSearchIndex(),
searchRequestBuilder -> {
final QueryHelper queryHelper = ComponentUtil.getQueryHelper();
queryHelper.processSearchPreference(searchRequestBuilder, userBean, query);
return SearchConditionBuilder.builder(searchRequestBuilder).scroll().query(query).size(pageSize)
.responseFields(queryHelper.getScrollResponseFields()).searchRequestType(params.getType()).build();
- },
- (searchResponse, hit) -> {
+ }, (searchResponse, hit) -> {
final Map<String, Object> docMap = new HashMap<>();
final Map<String, Object> source = hit.getSourceAsMap();
if (source != null) {
@@ -285,45 +281,41 @@ public class SearchHelper {
public OptionalEntity<Map<String, Object>> getDocumentByDocId(final String docId, final String[] fields,
final OptionalThing<FessUserBean> userBean) {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
- return ComponentUtil.getFessEsClient().getDocument(
- fessConfig.getIndexDocumentSearchIndex(),
- builder -> {
- final BoolQueryBuilder boolQuery =
- QueryBuilders.boolQuery().must(QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), docId));
- final Set<String> roleSet = ComponentUtil.getRoleQueryHelper().build(SearchRequestType.JSON); // TODO SearchRequestType?
- final QueryHelper queryHelper = ComponentUtil.getQueryHelper();
- if (!roleSet.isEmpty()) {
- queryHelper.buildRoleQuery(roleSet, boolQuery);
- }
- builder.setQuery(boolQuery);
- builder.setFetchSource(fields, null);
- queryHelper.processSearchPreference(builder, userBean, docId);
- return true;
- });
+ return ComponentUtil.getFessEsClient().getDocument(fessConfig.getIndexDocumentSearchIndex(), builder -> {
+ final BoolQueryBuilder boolQuery =
+ QueryBuilders.boolQuery().must(QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), docId));
+ final Set<String> roleSet = ComponentUtil.getRoleQueryHelper().build(SearchRequestType.JSON); // TODO SearchRequestType?
+ final QueryHelper queryHelper = ComponentUtil.getQueryHelper();
+ if (!roleSet.isEmpty()) {
+ queryHelper.buildRoleQuery(roleSet, boolQuery);
+ }
+ builder.setQuery(boolQuery);
+ builder.setFetchSource(fields, null);
+ queryHelper.processSearchPreference(builder, userBean, docId);
+ return true;
+ });
}
public List<Map<String, Object>> getDocumentListByDocIds(final String[] docIds, final String[] fields,
final OptionalThing<FessUserBean> userBean, final SearchRequestType searchRequestType) {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
- return ComponentUtil.getFessEsClient().getDocumentList(
- fessConfig.getIndexDocumentSearchIndex(),
- builder -> {
- final BoolQueryBuilder boolQuery =
- QueryBuilders.boolQuery().must(QueryBuilders.termsQuery(fessConfig.getIndexFieldDocId(), docIds));
- final QueryHelper queryHelper = ComponentUtil.getQueryHelper();
- if (searchRequestType != SearchRequestType.ADMIN_SEARCH) {
- final Set<String> roleSet = ComponentUtil.getRoleQueryHelper().build(searchRequestType);
- if (!roleSet.isEmpty()) {
- queryHelper.buildRoleQuery(roleSet, boolQuery);
- }
- }
- builder.setQuery(boolQuery);
- builder.setSize(fessConfig.getPagingSearchPageMaxSizeAsInteger());
- builder.setFetchSource(fields, null);
- queryHelper.processSearchPreference(builder, userBean, String.join(StringUtil.EMPTY, docIds));
- return true;
- });
+ return ComponentUtil.getFessEsClient().getDocumentList(fessConfig.getIndexDocumentSearchIndex(), builder -> {
+ final BoolQueryBuilder boolQuery =
+ QueryBuilders.boolQuery().must(QueryBuilders.termsQuery(fessConfig.getIndexFieldDocId(), docIds));
+ final QueryHelper queryHelper = ComponentUtil.getQueryHelper();
+ if (searchRequestType != SearchRequestType.ADMIN_SEARCH) {
+ final Set<String> roleSet = ComponentUtil.getRoleQueryHelper().build(searchRequestType);
+ if (!roleSet.isEmpty()) {
+ queryHelper.buildRoleQuery(roleSet, boolQuery);
+ }
+ }
+ builder.setQuery(boolQuery);
+ builder.setSize(fessConfig.getPagingSearchPageMaxSizeAsInteger());
+ builder.setFetchSource(fields, null);
+ queryHelper.processSearchPreference(builder, userBean, String.join(StringUtil.EMPTY, docIds));
+ return true;
+ });
}
public boolean update(final String id, final String field, final Object value) {
diff --git a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
index 39ae7b793..0235fc9f3 100644
--- a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
@@ -250,24 +250,22 @@ public class SearchLogHelper {
final List<SearchLog> searchLogList = new ArrayList<>();
final Map<String, UserInfo> userInfoMap = new HashMap<>();
- queue.stream().forEach(
- searchLog -> {
- final String userAgent = searchLog.getUserAgent();
- final boolean isBot =
- userAgent != null
- && stream(botNames).get(stream -> stream.anyMatch(botName -> userAgent.indexOf(botName) >= 0));
- if (!isBot) {
- searchLog.getUserInfo().ifPresent(userInfo -> {
- final String code = userInfo.getId();
- final UserInfo oldUserInfo = userInfoMap.get(code);
- if (oldUserInfo != null) {
- userInfo.setCreatedAt(oldUserInfo.getCreatedAt());
- }
- userInfoMap.put(code, userInfo);
- });
- searchLogList.add(searchLog);
+ queue.stream().forEach(searchLog -> {
+ final String userAgent = searchLog.getUserAgent();
+ final boolean isBot =
+ userAgent != null && stream(botNames).get(stream -> stream.anyMatch(botName -> userAgent.indexOf(botName) >= 0));
+ if (!isBot) {
+ searchLog.getUserInfo().ifPresent(userInfo -> {
+ final String code = userInfo.getId();
+ final UserInfo oldUserInfo = userInfoMap.get(code);
+ if (oldUserInfo != null) {
+ userInfo.setCreatedAt(oldUserInfo.getCreatedAt());
}
+ userInfoMap.put(code, userInfo);
});
+ searchLogList.add(searchLog);
+ }
+ });
if (!userInfoMap.isEmpty()) {
final List<UserInfo> insertList = new ArrayList<>(userInfoMap.values());
@@ -348,23 +346,19 @@ public class SearchLogHelper {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
try {
final UpdateRequest[] updateRequests =
- searchHelper
- .getDocumentListByDocIds(clickCountMap.keySet().toArray(new String[clickCountMap.size()]),
- new String[] { fessConfig.getIndexFieldDocId(), fessConfig.getIndexFieldLang() },
- OptionalThing.of(FessUserBean.empty()), SearchRequestType.ADMIN_SEARCH)
- .stream()
- .map(doc -> {
+ searchHelper.getDocumentListByDocIds(clickCountMap.keySet().toArray(new String[clickCountMap.size()]),
+ new String[] { fessConfig.getIndexFieldDocId(), fessConfig.getIndexFieldLang() },
+ OptionalThing.of(FessUserBean.empty()), SearchRequestType.ADMIN_SEARCH).stream().map(doc -> {
final String id = DocumentUtil.getValue(doc, fessConfig.getIndexFieldId(), String.class);
final String docId = DocumentUtil.getValue(doc, fessConfig.getIndexFieldDocId(), String.class);
if (id != null && docId != null && clickCountMap.containsKey(docId)) {
final Integer count = clickCountMap.get(docId);
- final Script script =
- ComponentUtil.getLanguageHelper().createScript(doc,
- "ctx._source." + fessConfig.getIndexFieldClickCount() + "+=" + count.toString());
+ final Script script = ComponentUtil.getLanguageHelper().createScript(doc,
+ "ctx._source." + fessConfig.getIndexFieldClickCount() + "+=" + count.toString());
final Map<String, Object> upsertMap = new HashMap<>();
upsertMap.put(fessConfig.getIndexFieldClickCount(), count);
- return new UpdateRequest(fessConfig.getIndexDocumentUpdateIndex(), id).script(script).upsert(
- upsertMap);
+ return new UpdateRequest(fessConfig.getIndexDocumentUpdateIndex(), id).script(script)
+ .upsert(upsertMap);
}
return null;
}).filter(req -> req != null).toArray(n -> new UpdateRequest[n]);
diff --git a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
index 6ed117195..a7d1ecc35 100644
--- a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
@@ -90,8 +90,8 @@ public class SuggestHelper {
logger.debug("Initialize {}", this.getClass().getSimpleName());
}
fessConfig = ComponentUtil.getFessConfig();
- split(fessConfig.getSuggestFieldContents(), ",").of(
- stream -> stream.filter(StringUtil::isNotBlank).forEach(contentFieldNameSet::add));
+ split(fessConfig.getSuggestFieldContents(), ",")
+ .of(stream -> stream.filter(StringUtil::isNotBlank).forEach(contentFieldNameSet::add));
split(fessConfig.getSuggestFieldTags(), ",").of(stream -> stream.filter(StringUtil::isNotBlank).forEach(tagFieldNameSet::add));
split(fessConfig.getSuggestFieldRoles(), ",").of(stream -> stream.filter(StringUtil::isNotBlank).forEach(roleFieldNameSet::add));
contentFieldList = Arrays.asList(stream(fessConfig.getSuggestFieldContents()).get(stream -> stream.toArray(n -> new String[n])));
@@ -137,68 +137,67 @@ public class SuggestHelper {
public void indexFromSearchLog(final List<SearchLog> searchLogList) {
final Map<String, LocalDateTime> duplicateSessionMap = new HashMap<>();
- searchLogList.stream().forEach(
- searchLog -> {
- if (searchLog.getHitCount() == null
- || searchLog.getHitCount().longValue() < fessConfig.getSuggestMinHitCountAsInteger().longValue()) {
- return;
- }
+ searchLogList.stream().forEach(searchLog -> {
+ if (searchLog.getHitCount() == null
+ || searchLog.getHitCount().longValue() < fessConfig.getSuggestMinHitCountAsInteger().longValue()) {
+ return;
+ }
- final String sessionId;
- if (searchLog.getUserSessionId() != null) {
- sessionId = searchLog.getUserSessionId();
- } else {
- if (Constants.SEARCH_LOG_ACCESS_TYPE_WEB.equals(searchLog.getAccessType())) {
- sessionId = searchLog.getClientIp();
- } else {
- sessionId = searchLog.getClientIp() + '_' + searchLog.getSearchWord();
- }
- }
+ final String sessionId;
+ if (searchLog.getUserSessionId() != null) {
+ sessionId = searchLog.getUserSessionId();
+ } else {
+ if (Constants.SEARCH_LOG_ACCESS_TYPE_WEB.equals(searchLog.getAccessType())) {
+ sessionId = searchLog.getClientIp();
+ } else {
+ sessionId = searchLog.getClientIp() + '_' + searchLog.getSearchWord();
+ }
+ }
- final LocalDateTime requestedAt = searchLog.getRequestedAt();
- if (sessionId == null) {
- return;
- } else if (duplicateSessionMap.containsKey(sessionId)) {
- if (duplicateSessionMap.get(sessionId).plusMinutes(searchStoreIntervalMinute).isAfter(requestedAt)) {
- return;
- }
- }
+ final LocalDateTime requestedAt = searchLog.getRequestedAt();
+ if (sessionId == null) {
+ return;
+ } else if (duplicateSessionMap.containsKey(sessionId)) {
+ if (duplicateSessionMap.get(sessionId).plusMinutes(searchStoreIntervalMinute).isAfter(requestedAt)) {
+ return;
+ }
+ }
- final StringBuilder sb = new StringBuilder(100);
- final List<String> fields = new ArrayList<>();
- final List<String> tags = new ArrayList<>();
- final List<String> roles = new ArrayList<>();
-
- for (final Pair<String, String> searchFieldLog : searchLog.getSearchFieldLogList()) {
- final String name = searchFieldLog.getFirst();
- if (contentFieldNameSet.contains(name)) {
- if (sb.length() > 0) {
- sb.append(TEXT_SEP);
- }
- sb.append(searchFieldLog.getSecond());
- fields.add(name);
- } else if (tagFieldNameSet.contains(name)) {
- tags.add(searchFieldLog.getSecond());
- } else if (roleFieldNameSet.contains(name)) {
- roles.add(searchFieldLog.getSecond());
- }
- }
-
- final String virtualHost = searchLog.getVirtualHost();
- if (virtualHost != null) {
- tags.add(virtualHost);
- }
+ final StringBuilder sb = new StringBuilder(100);
+ final List<String> fields = new ArrayList<>();
+ final List<String> tags = new ArrayList<>();
+ final List<String> roles = new ArrayList<>();
+ for (final Pair<String, String> searchFieldLog : searchLog.getSearchFieldLogList()) {
+ final String name = searchFieldLog.getFirst();
+ if (contentFieldNameSet.contains(name)) {
if (sb.length() > 0) {
- final String[] langs = searchLog.getLanguages() == null ? new String[] {} : searchLog.getLanguages().split(",");
- stream(searchLog.getRoles()).of(stream -> stream.forEach(role -> roles.add(role)));
- if (fessConfig.isValidSearchLogPermissions(roles.toArray(new String[roles.size()]))) {
- suggester.indexer().indexFromSearchWord(sb.toString(), fields.toArray(new String[fields.size()]),
- tags.toArray(new String[tags.size()]), roles.toArray(new String[roles.size()]), 1, langs);
- duplicateSessionMap.put(sessionId, requestedAt);
- }
+ sb.append(TEXT_SEP);
}
- });
+ sb.append(searchFieldLog.getSecond());
+ fields.add(name);
+ } else if (tagFieldNameSet.contains(name)) {
+ tags.add(searchFieldLog.getSecond());
+ } else if (roleFieldNameSet.contains(name)) {
+ roles.add(searchFieldLog.getSecond());
+ }
+ }
+
+ final String virtualHost = searchLog.getVirtualHost();
+ if (virtualHost != null) {
+ tags.add(virtualHost);
+ }
+
+ if (sb.length() > 0) {
+ final String[] langs = searchLog.getLanguages() == null ? new String[] {} : searchLog.getLanguages().split(",");
+ stream(searchLog.getRoles()).of(stream -> stream.forEach(role -> roles.add(role)));
+ if (fessConfig.isValidSearchLogPermissions(roles.toArray(new String[roles.size()]))) {
+ suggester.indexer().indexFromSearchWord(sb.toString(), fields.toArray(new String[fields.size()]),
+ tags.toArray(new String[tags.size()]), roles.toArray(new String[roles.size()]), 1, langs);
+ duplicateSessionMap.put(sessionId, requestedAt);
+ }
+ }
+ });
refresh();
}
@@ -207,40 +206,37 @@ public class SuggestHelper {
final long interval = fessConfig.getSuggestUpdateRequestIntervalAsInteger().longValue();
final int docPerReq = fessConfig.getSuggestUpdateDocPerRequestAsInteger();
final SystemHelper systemHelper = ComponentUtil.getSystemHelper();
- suggester
- .indexer()
- .indexFromDocument(
- () -> {
- final ESSourceReader reader =
- new ESSourceReader(ComponentUtil.getFessEsClient(), suggester.settings(),
- fessConfig.getIndexDocumentSearchIndex(), "_doc"); // TODO remove type
- reader.setScrollSize(fessConfig.getSuggestSourceReaderScrollSizeAsInteger());
- reader.setLimitDocNumPercentage(fessConfig.getSuggestUpdateContentsLimitNumPercentage());
- reader.setLimitNumber(fessConfig.getSuggestUpdateContentsLimitNumAsInteger());
- reader.setLimitOfDocumentSize(fessConfig.getSuggestUpdateContentsLimitDocSizeAsInteger());
-
- final List<FunctionScoreQueryBuilder.FilterFunctionBuilder> flist = new ArrayList<>();
- flist.add(new FunctionScoreQueryBuilder.FilterFunctionBuilder(ScoreFunctionBuilders.randomFunction()
- .seed(System.currentTimeMillis()).setField(fessConfig.getIndexFieldDocId())));
- reader.setQuery(QueryBuilders.functionScoreQuery(QueryBuilders.matchAllQuery(),
- flist.toArray(new FunctionScoreQueryBuilder.FilterFunctionBuilder[flist.size()])).boostMode(
- CombineFunction.MULTIPLY));
- reader.addSort(SortBuilders.fieldSort(fessConfig.getIndexFieldClickCount()));
- reader.addSort(SortBuilders.scoreSort());
- return reader;
- }, docPerReq, () -> {
- systemHelper.calibrateCpuLoad();
- ThreadUtil.sleep(interval);
- }).then(response -> {
- refresh();
- success.accept(true);
- }).error(t -> error.accept(t));
+ suggester.indexer().indexFromDocument(() -> {
+ final ESSourceReader reader = new ESSourceReader(ComponentUtil.getFessEsClient(), suggester.settings(),
+ fessConfig.getIndexDocumentSearchIndex(), "_doc"); // TODO remove type
+ reader.setScrollSize(fessConfig.getSuggestSourceReaderScrollSizeAsInteger());
+ reader.setLimitDocNumPercentage(fessConfig.getSuggestUpdateContentsLimitNumPercentage());
+ reader.setLimitNumber(fessConfig.getSuggestUpdateContentsLimitNumAsInteger());
+ reader.setLimitOfDocumentSize(fessConfig.getSuggestUpdateContentsLimitDocSizeAsInteger());
+
+ final List<FunctionScoreQueryBuilder.FilterFunctionBuilder> flist = new ArrayList<>();
+ flist.add(new FunctionScoreQueryBuilder.FilterFunctionBuilder(
+ ScoreFunctionBuilders.randomFunction().seed(System.currentTimeMillis()).setField(fessConfig.getIndexFieldDocId())));
+ reader.setQuery(QueryBuilders
+ .functionScoreQuery(QueryBuilders.matchAllQuery(),
+ flist.toArray(new FunctionScoreQueryBuilder.FilterFunctionBuilder[flist.size()]))
+ .boostMode(CombineFunction.MULTIPLY));
+ reader.addSort(SortBuilders.fieldSort(fessConfig.getIndexFieldClickCount()));
+ reader.addSort(SortBuilders.scoreSort());
+ return reader;
+ }, docPerReq, () -> {
+ systemHelper.calibrateCpuLoad();
+ ThreadUtil.sleep(interval);
+ }).then(response -> {
+ refresh();
+ success.accept(true);
+ }).error(t -> error.accept(t));
}
public void purgeDocumentSuggest(final LocalDateTime time) {
final BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
- boolQueryBuilder.must(QueryBuilders.rangeQuery(FieldNames.TIMESTAMP).lt(
- time.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()));
+ boolQueryBuilder
+ .must(QueryBuilders.rangeQuery(FieldNames.TIMESTAMP).lt(time.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()));
boolQueryBuilder.must(QueryBuilders.termQuery(FieldNames.KINDS, SuggestItem.Kind.DOCUMENT.toString()));
boolQueryBuilder.mustNot(QueryBuilders.termQuery(FieldNames.KINDS, SuggestItem.Kind.QUERY.toString()));
@@ -251,8 +247,8 @@ public class SuggestHelper {
public void purgeSearchlogSuggest(final LocalDateTime time) {
final BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
- boolQueryBuilder.must(QueryBuilders.rangeQuery(FieldNames.TIMESTAMP).lt(
- time.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()));
+ boolQueryBuilder
+ .must(QueryBuilders.rangeQuery(FieldNames.TIMESTAMP).lt(time.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()));
boolQueryBuilder.mustNot(QueryBuilders.termQuery(FieldNames.KINDS, SuggestItem.Kind.DOCUMENT.toString()));
boolQueryBuilder.must(QueryBuilders.termQuery(FieldNames.KINDS, SuggestItem.Kind.QUERY.toString()));
@@ -357,9 +353,8 @@ public class SuggestHelper {
}
}
- suggester.indexer().addElevateWord(
- new org.codelibs.fess.suggest.entity.ElevateWord(word, boost, Arrays.asList(readings), contentFieldList, labelList,
- roleList), apply);
+ suggester.indexer().addElevateWord(new org.codelibs.fess.suggest.entity.ElevateWord(word, boost, Arrays.asList(readings),
+ contentFieldList, labelList, roleList), apply);
refresh();
}
diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java
index 057a064ae..659bdbbe3 100644
--- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java
@@ -133,31 +133,30 @@ public class SystemHelper {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
filterPathEncoding = fessConfig.getPathEncoding();
supportedLanguages = fessConfig.getSupportedLanguagesAsArray();
- langItemsCache =
- CacheBuilder.newBuilder().maximumSize(20).expireAfterAccess(1, TimeUnit.HOURS)
- .build(new CacheLoader<String, List<Map<String, String>>>() {
- @Override
- public List<Map<String, String>> load(final String key) throws Exception {
- final ULocale uLocale = new ULocale(key);
- final Locale displayLocale = uLocale.toLocale();
- final List<Map<String, String>> langItems = new ArrayList<>(supportedLanguages.length);
- final String msg = ComponentUtil.getMessageManager().getMessage(displayLocale, "labels.allLanguages");
- final Map<String, String> defaultMap = new HashMap<>(2);
- defaultMap.put(Constants.ITEM_LABEL, msg);
- defaultMap.put(Constants.ITEM_VALUE, "all");
- langItems.add(defaultMap);
-
- for (final String lang : supportedLanguages) {
- final Locale locale = LocaleUtils.toLocale(lang);
- final String label = locale.getDisplayName(displayLocale);
- final Map<String, String> map = new HashMap<>(2);
- map.put(Constants.ITEM_LABEL, label);
- map.put(Constants.ITEM_VALUE, lang);
- langItems.add(map);
- }
- return langItems;
- }
- });
+ langItemsCache = CacheBuilder.newBuilder().maximumSize(20).expireAfterAccess(1, TimeUnit.HOURS)
+ .build(new CacheLoader<String, List<Map<String, String>>>() {
+ @Override
+ public List<Map<String, String>> load(final String key) throws Exception {
+ final ULocale uLocale = new ULocale(key);
+ final Locale displayLocale = uLocale.toLocale();
+ final List<Map<String, String>> langItems = new ArrayList<>(supportedLanguages.length);
+ final String msg = ComponentUtil.getMessageManager().getMessage(displayLocale, "labels.allLanguages");
+ final Map<String, String> defaultMap = new HashMap<>(2);
+ defaultMap.put(Constants.ITEM_LABEL, msg);
+ defaultMap.put(Constants.ITEM_VALUE, "all");
+ langItems.add(defaultMap);
+
+ for (final String lang : supportedLanguages) {
+ final Locale locale = LocaleUtils.toLocale(lang);
+ final String label = locale.getDisplayName(displayLocale);
+ final Map<String, String> map = new HashMap<>(2);
+ map.put(Constants.ITEM_LABEL, label);
+ map.put(Constants.ITEM_VALUE, lang);
+ langItems.add(map);
+ }
+ return langItems;
+ }
+ });
ComponentUtil.doInitProcesses(Runnable::run);
@@ -322,29 +321,22 @@ public class SystemHelper {
public void refreshDesignJspFiles() {
final ServletContext servletContext = LaServletContextUtil.getServletContext();
- stream(ComponentUtil.getVirtualHostHelper().getVirtualHostPaths()).of(
- stream -> stream.filter(s -> s != null && !s.equals("/")).forEach(
- key -> {
- designJspFileNameMap
- .entrySet()
- .stream()
- .forEach(
- e -> {
- final File jspFile =
- new File(servletContext.getRealPath("/WEB-INF/view" + key + "/" + e.getValue()));
- if (!jspFile.exists()) {
- jspFile.getParentFile().mkdirs();
- final File baseJspFile =
- new File(servletContext.getRealPath("/WEB-INF/view/" + e.getValue()));
- try {
- Files.copy(baseJspFile.toPath(), jspFile.toPath());
- } catch (final IOException ex) {
- logger.warn("Could not copy from " + baseJspFile.getAbsolutePath() + " to "
- + jspFile.getAbsolutePath(), ex);
- }
- }
- });
- }));
+ stream(ComponentUtil.getVirtualHostHelper().getVirtualHostPaths())
+ .of(stream -> stream.filter(s -> s != null && !s.equals("/")).forEach(key -> {
+ designJspFileNameMap.entrySet().stream().forEach(e -> {
+ final File jspFile = new File(servletContext.getRealPath("/WEB-INF/view" + key + "/" + e.getValue()));
+ if (!jspFile.exists()) {
+ jspFile.getParentFile().mkdirs();
+ final File baseJspFile = new File(servletContext.getRealPath("/WEB-INF/view/" + e.getValue()));
+ try {
+ Files.copy(baseJspFile.toPath(), jspFile.toPath());
+ } catch (final IOException ex) {
+ logger.warn("Could not copy from " + baseJspFile.getAbsolutePath() + " to " + jspFile.getAbsolutePath(),
+ ex);
+ }
+ }
+ });
+ }));
}
public boolean isForceStop() {
@@ -540,8 +532,8 @@ public class SystemHelper {
public void setLogLevel(final String level) {
final Level logLevel = Level.toLevel(level, Level.WARN);
System.setProperty(Constants.FESS_LOG_LEVEL, logLevel.toString());
- split(ComponentUtil.getFessConfig().getLoggingAppPackages(), ",").of(
- stream -> stream.map(String::trim).filter(StringUtil::isNotEmpty).forEach(s -> Configurator.setLevel(s, logLevel)));
+ split(ComponentUtil.getFessConfig().getLoggingAppPackages(), ",")
+ .of(stream -> stream.map(String::trim).filter(StringUtil::isNotEmpty).forEach(s -> Configurator.setLevel(s, logLevel)));
}
public String getLogLevel() {
diff --git a/src/main/java/org/codelibs/fess/helper/UserInfoHelper.java b/src/main/java/org/codelibs/fess/helper/UserInfoHelper.java
index b99f6273c..bab5846eb 100644
--- a/src/main/java/org/codelibs/fess/helper/UserInfoHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/UserInfoHelper.java
@@ -85,9 +85,8 @@ public class UserInfoHelper {
protected String getUserCodeFromUserBean(final HttpServletRequest request) {
final SessionManager sessionManager = ComponentUtil.getComponent(SessionManager.class);
- String userCode =
- sessionManager.getAttribute(USER_BEAN, TypicalUserBean.class).filter(u -> !Constants.EMPTY_USER_ID.equals(u.getUserId()))
- .map(u -> u.getUserId().toString()).orElse(StringUtil.EMPTY);
+ String userCode = sessionManager.getAttribute(USER_BEAN, TypicalUserBean.class)
+ .filter(u -> !Constants.EMPTY_USER_ID.equals(u.getUserId())).map(u -> u.getUserId().toString()).orElse(StringUtil.EMPTY);
if (StringUtil.isBlank(userCode)) {
return null;
}
diff --git a/src/main/java/org/codelibs/fess/helper/ViewHelper.java b/src/main/java/org/codelibs/fess/helper/ViewHelper.java
index 271618615..7ac3985cd 100644
--- a/src/main/java/org/codelibs/fess/helper/ViewHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/ViewHelper.java
@@ -170,8 +170,8 @@ public class ViewHelper {
}
try {
final ServletContext servletContext = ComponentUtil.getComponent(ServletContext.class);
- servletContext.setSessionTrackingModes(fessConfig.getSessionTrackingModesAsSet().stream().map(SessionTrackingMode::valueOf)
- .collect(Collectors.toSet()));
+ servletContext.setSessionTrackingModes(
+ fessConfig.getSessionTrackingModesAsSet().stream().map(SessionTrackingMode::valueOf).collect(Collectors.toSet()));
} catch (final Throwable t) {
logger.warn("Failed to set SessionTrackingMode.", t);
}
@@ -746,10 +746,8 @@ public class ViewHelper {
public FacetResponse getCachedFacetResponse(final String query) {
final OptionalThing<FessUserBean> userBean = ComponentUtil.getComponent(FessLoginAssist.class).getSavedUserBean();
- final String permissionKey =
- userBean.map(
- user -> StreamUtil.stream(user.getPermissions()).get(
- stream -> stream.sorted().distinct().collect(Collectors.joining("\n")))).orElse(StringUtil.EMPTY);
+ final String permissionKey = userBean.map(user -> StreamUtil.stream(user.getPermissions())
+ .get(stream -> stream.sorted().distinct().collect(Collectors.joining("\n")))).orElse(StringUtil.EMPTY);
try {
return facetCache.get(query + "\n" + permissionKey, () -> {
diff --git a/src/main/java/org/codelibs/fess/helper/VirtualHostHelper.java b/src/main/java/org/codelibs/fess/helper/VirtualHostHelper.java
index 51fc91154..720aafcdd 100644
--- a/src/main/java/org/codelibs/fess/helper/VirtualHostHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/VirtualHostHelper.java
@@ -61,7 +61,7 @@ public class VirtualHostHelper {
}
public String[] getVirtualHostPaths() {
- return stream(ComponentUtil.getFessConfig().getVirtualHosts()).get(
- stream -> stream.map(h -> "/" + h.getValue3()).toArray(n -> new String[n]));
+ return stream(ComponentUtil.getFessConfig().getVirtualHosts())
+ .get(stream -> stream.map(h -> "/" + h.getValue3()).toArray(n -> new String[n]));
}
}
diff --git a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
index 77deb3d5a..a49d15d0c 100644
--- a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
+++ b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
@@ -174,20 +174,16 @@ public class IndexUpdater extends Thread {
final int maxEmptyListCount = fessConfig.getIndexerWebfsMaxEmptyListCountAsInteger();
final IntervalControlHelper intervalControlHelper = ComponentUtil.getIntervalControlHelper();
try {
- final Consumer<SearchRequestBuilder> cb =
- builder -> {
- final QueryBuilder queryBuilder =
- QueryBuilders
- .boolQuery()
- .filter(QueryBuilders.termsQuery(EsAccessResult.SESSION_ID, sessionIdList))
- .filter(QueryBuilders.termQuery(EsAccessResult.STATUS,
- org.codelibs.fess.crawler.Constants.OK_STATUS));
- builder.setQuery(queryBuilder);
- builder.setFrom(0);
- final int maxDocumentCacheSize = fessConfig.getIndexerWebfsMaxDocumentCacheSizeAsInteger();
- builder.setSize(maxDocumentCacheSize <= 0 ? 1 : maxDocumentCacheSize);
- builder.addSort(EsAccessResult.CREATE_TIME, SortOrder.ASC);
- };
+ final Consumer<SearchRequestBuilder> cb = builder -> {
+ final QueryBuilder queryBuilder =
+ QueryBuilders.boolQuery().filter(QueryBuilders.termsQuery(EsAccessResult.SESSION_ID, sessionIdList))
+ .filter(QueryBuilders.termQuery(EsAccessResult.STATUS, org.codelibs.fess.crawler.Constants.OK_STATUS));
+ builder.setQuery(queryBuilder);
+ builder.setFrom(0);
+ final int maxDocumentCacheSize = fessConfig.getIndexerWebfsMaxDocumentCacheSizeAsInteger();
+ builder.setSize(maxDocumentCacheSize <= 0 ? 1 : maxDocumentCacheSize);
+ builder.addSort(EsAccessResult.CREATE_TIME, SortOrder.ASC);
+ };
final DocList docList = new DocList();
final List<EsAccessResult> accessResultList = new ArrayList<>();
@@ -323,7 +319,8 @@ public class IndexUpdater extends Thread {
}
- private void processAccessResults(final DocList docList, final List<EsAccessResult> accessResultList, final List<EsAccessResult> arList) {
+ private void processAccessResults(final DocList docList, final List<EsAccessResult> accessResultList,
+ final List<EsAccessResult> arList) {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
final long maxDocumentRequestSize = Long.parseLong(fessConfig.getIndexerWebfsMaxDocumentRequestSize());
for (final EsAccessResult accessResult : arList) {
diff --git a/src/main/java/org/codelibs/fess/job/CrawlJob.java b/src/main/java/org/codelibs/fess/job/CrawlJob.java
index 1a7471790..9d6c06a83 100644
--- a/src/main/java/org/codelibs/fess/job/CrawlJob.java
+++ b/src/main/java/org/codelibs/fess/job/CrawlJob.java
@@ -90,8 +90,8 @@ public class CrawlJob extends ExecJob {
if (maxCrawlerProcesses > 0) {
final int runningJobCount = getRunningJobCount();
if (runningJobCount > maxCrawlerProcesses) {
- throw new JobProcessingException(runningJobCount + " crawler processes are running. Max processes are "
- + maxCrawlerProcesses + ".");
+ throw new JobProcessingException(
+ runningJobCount + " crawler processes are running. Max processes are " + maxCrawlerProcesses + ".");
}
}
@@ -230,14 +230,14 @@ public class CrawlJob extends ExecJob {
buf.append(targetClassesDir.getAbsolutePath());
}
// WEB-INF/lib
- appendJarFile(cpSeparator, buf, new File(servletContext.getRealPath("/WEB-INF/lib")), "WEB-INF" + File.separator + "lib"
- + File.separator);
+ appendJarFile(cpSeparator, buf, new File(servletContext.getRealPath("/WEB-INF/lib")),
+ "WEB-INF" + File.separator + "lib" + File.separator);
// WEB-INF/env/crawler/lib
- appendJarFile(cpSeparator, buf, new File(servletContext.getRealPath("/WEB-INF/env/" + getExecuteType() + "/lib")), "WEB-INF"
- + File.separator + "env" + File.separator + getExecuteType() + File.separator + "lib" + File.separator);
+ appendJarFile(cpSeparator, buf, new File(servletContext.getRealPath("/WEB-INF/env/" + getExecuteType() + "/lib")),
+ "WEB-INF" + File.separator + "env" + File.separator + getExecuteType() + File.separator + "lib" + File.separator);
// WEB-INF/plugin
- appendJarFile(cpSeparator, buf, new File(servletContext.getRealPath("/WEB-INF/plugin")), "WEB-INF" + File.separator + "plugin"
- + File.separator);
+ appendJarFile(cpSeparator, buf, new File(servletContext.getRealPath("/WEB-INF/plugin")),
+ "WEB-INF" + File.separator + "plugin" + File.separator);
final File targetLibDir = new File(targetDir, "fess" + File.separator + "WEB-INF" + File.separator + "lib");
if (targetLibDir.isDirectory()) {
appendJarFile(cpSeparator, buf, targetLibDir, targetLibDir.getAbsolutePath() + File.separator);
@@ -274,8 +274,8 @@ public class CrawlJob extends ExecJob {
cmdList.add("-Dorg.apache.tika.service.error.warn=true");
}
}
- stream(fessConfig.getJvmCrawlerOptionsAsArray()).of(
- stream -> stream.filter(StringUtil::isNotBlank).forEach(value -> cmdList.add(value)));
+ stream(fessConfig.getJvmCrawlerOptionsAsArray())
+ .of(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/job/GenerateThumbnailJob.java b/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java
index 39075d1fd..24c301faf 100644
--- a/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java
+++ b/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java
@@ -127,14 +127,14 @@ public class GenerateThumbnailJob extends ExecJob {
buf.append(targetClassesDir.getAbsolutePath());
}
// WEB-INF/lib
- appendJarFile(cpSeparator, buf, new File(servletContext.getRealPath("/WEB-INF/lib")), "WEB-INF" + File.separator + "lib"
- + File.separator);
+ appendJarFile(cpSeparator, buf, new File(servletContext.getRealPath("/WEB-INF/lib")),
+ "WEB-INF" + File.separator + "lib" + File.separator);
// WEB-INF/env/thumbnail/lib
- appendJarFile(cpSeparator, buf, new File(servletContext.getRealPath("/WEB-INF/env/" + getExecuteType() + "/lib")), "WEB-INF"
- + File.separator + "env" + File.separator + getExecuteType() + File.separator + "lib" + File.separator);
+ appendJarFile(cpSeparator, buf, new File(servletContext.getRealPath("/WEB-INF/env/" + getExecuteType() + "/lib")),
+ "WEB-INF" + File.separator + "env" + File.separator + getExecuteType() + File.separator + "lib" + File.separator);
// WEB-INF/plugin
- appendJarFile(cpSeparator, buf, new File(servletContext.getRealPath("/WEB-INF/plugin")), "WEB-INF" + File.separator + "plugin"
- + File.separator);
+ appendJarFile(cpSeparator, buf, new File(servletContext.getRealPath("/WEB-INF/plugin")),
+ "WEB-INF" + File.separator + "plugin" + File.separator);
final File targetLibDir = new File(targetDir, "fess" + File.separator + "WEB-INF" + File.separator + "lib");
if (targetLibDir.isDirectory()) {
appendJarFile(cpSeparator, buf, targetLibDir, targetLibDir.getAbsolutePath() + File.separator);
@@ -172,8 +172,8 @@ public class GenerateThumbnailJob extends ExecJob {
if (logLevel != null) {
cmdList.add("-Dfess.log.level=" + logLevel);
}
- stream(fessConfig.getJvmThumbnailOptionsAsArray()).of(
- stream -> stream.filter(StringUtil::isNotBlank).forEach(value -> cmdList.add(value)));
+ stream(fessConfig.getJvmThumbnailOptionsAsArray())
+ .of(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/job/SuggestJob.java b/src/main/java/org/codelibs/fess/job/SuggestJob.java
index 72e9fb327..df50d2480 100644
--- a/src/main/java/org/codelibs/fess/job/SuggestJob.java
+++ b/src/main/java/org/codelibs/fess/job/SuggestJob.java
@@ -114,14 +114,14 @@ public class SuggestJob extends ExecJob {
buf.append(targetClassesDir.getAbsolutePath());
}
// WEB-INF/lib
- appendJarFile(cpSeparator, buf, new File(servletContext.getRealPath("/WEB-INF/lib")), "WEB-INF" + File.separator + "lib"
- + File.separator);
+ appendJarFile(cpSeparator, buf, new File(servletContext.getRealPath("/WEB-INF/lib")),
+ "WEB-INF" + File.separator + "lib" + File.separator);
// WEB-INF/env/suggest/lib
- appendJarFile(cpSeparator, buf, new File(servletContext.getRealPath("/WEB-INF/env/" + getExecuteType() + "/lib")), "WEB-INF"
- + File.separator + "env" + File.separator + getExecuteType() + File.separator + "lib" + File.separator);
+ appendJarFile(cpSeparator, buf, new File(servletContext.getRealPath("/WEB-INF/env/" + getExecuteType() + "/lib")),
+ "WEB-INF" + File.separator + "env" + File.separator + getExecuteType() + File.separator + "lib" + File.separator);
// WEB-INF/plugin
- appendJarFile(cpSeparator, buf, new File(servletContext.getRealPath("/WEB-INF/plugin")), "WEB-INF" + File.separator + "plugin"
- + File.separator);
+ appendJarFile(cpSeparator, buf, new File(servletContext.getRealPath("/WEB-INF/plugin")),
+ "WEB-INF" + File.separator + "plugin" + File.separator);
final File targetLibDir = new File(targetDir, "fess" + File.separator + "WEB-INF" + File.separator + "lib");
if (targetLibDir.isDirectory()) {
appendJarFile(cpSeparator, buf, targetLibDir, targetLibDir.getAbsolutePath() + File.separator);
@@ -159,8 +159,8 @@ public class SuggestJob extends ExecJob {
} else {
cmdList.add("-Dfess.log.level=" + logLevel);
}
- stream(fessConfig.getJvmSuggestOptionsAsArray()).of(
- stream -> stream.filter(StringUtil::isNotBlank).forEach(value -> cmdList.add(value)));
+ stream(fessConfig.getJvmSuggestOptionsAsArray())
+ .of(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/job/UpdateLabelJob.java b/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java
index 19d6be5fd..0df562b0c 100644
--- a/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java
+++ b/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java
@@ -46,37 +46,26 @@ public class UpdateLabelJob {
final StringBuilder resultBuf = new StringBuilder();
try {
- final long count =
- fessEsClient.updateByQuery(
- fessConfig.getIndexDocumentUpdateIndex(),
- option -> {
- if (queryBuilder != null) {
- option.setQuery(queryBuilder);
- }
- return option.setFetchSource(
- new String[] { fessConfig.getIndexFieldUrl(), fessConfig.getIndexFieldLang() }, null);
- },
- (builder, hit) -> {
- try {
- final Map<String, Object> doc = hit.getSourceAsMap();
- final String url = DocumentUtil.getValue(doc, fessConfig.getIndexFieldUrl(), String.class);
- if (StringUtil.isNotBlank(url)) {
- final Set<String> labelSet = labelTypeHelper.getMatchedLabelValueSet(url);
- final Script script =
- languageHelper.createScript(
- doc,
- "ctx._source."
- + fessConfig.getIndexFieldLabel()
- + "=new String[]{"
- + labelSet.stream().map(s -> "\"" + s + "\"")
- .collect(Collectors.joining(",")) + "}");
- return builder.setScript(script);
- }
- } catch (final Exception e) {
- logger.warn("Failed to process " + hit, e);
- }
- return null;
- });
+ final long count = fessEsClient.updateByQuery(fessConfig.getIndexDocumentUpdateIndex(), option -> {
+ if (queryBuilder != null) {
+ option.setQuery(queryBuilder);
+ }
+ return option.setFetchSource(new String[] { fessConfig.getIndexFieldUrl(), fessConfig.getIndexFieldLang() }, null);
+ }, (builder, hit) -> {
+ try {
+ final Map<String, Object> doc = hit.getSourceAsMap();
+ final String url = DocumentUtil.getValue(doc, fessConfig.getIndexFieldUrl(), String.class);
+ if (StringUtil.isNotBlank(url)) {
+ final Set<String> labelSet = labelTypeHelper.getMatchedLabelValueSet(url);
+ final Script script = languageHelper.createScript(doc, "ctx._source." + fessConfig.getIndexFieldLabel()
+ + "=new String[]{" + labelSet.stream().map(s -> "\"" + s + "\"").collect(Collectors.joining(",")) + "}");
+ return builder.setScript(script);
+ }
+ } catch (final Exception e) {
+ logger.warn("Failed to process " + hit, e);
+ }
+ return null;
+ });
resultBuf.append(count).append(" docs").append("\n");
} catch (final Exception e) {
logger.error("Could not update labels.", e);
diff --git a/src/main/java/org/codelibs/fess/ldap/LdapManager.java b/src/main/java/org/codelibs/fess/ldap/LdapManager.java
index cda1c4e82..6a19e8ae3 100644
--- a/src/main/java/org/codelibs/fess/ldap/LdapManager.java
+++ b/src/main/java/org/codelibs/fess/ldap/LdapManager.java
@@ -368,55 +368,50 @@ public class LdapManager {
}
final Supplier<Hashtable<String, String>> adminEnv = this::createAdminEnv;
- search(fessConfig.getLdapAdminUserBaseDn(),
- fessConfig.getLdapAdminUserFilter(user.getName()),
- null,
- adminEnv,
- result -> {
- if (!result.isEmpty()) {
- setAttributeValue(result, fessConfig.getLdapAttrSurname(), o -> user.setSurname(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrGivenName(), o -> user.setGivenName(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrMail(), o -> user.setMail(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrEmployeeNumber(), o -> user.setEmployeeNumber(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrTelephoneNumber(), o -> user.setTelephoneNumber(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrHomePhone(), o -> user.setHomePhone(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrHomePostalAddress(), o -> user.setHomePostalAddress(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrLabeleduri(), o -> user.setLabeledURI(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrRoomNumber(), o -> user.setRoomNumber(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrDescription(), o -> user.setDescription(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrTitle(), o -> user.setTitle(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrPager(), o -> user.setPager(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrStreet(), o -> user.setStreet(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrPostalCode(), o -> user.setPostalCode(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrPhysicalDeliveryOfficeName(),
- o -> user.setPhysicalDeliveryOfficeName(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrDestinationIndicator(),
- o -> user.setDestinationIndicator(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrInternationalisdnNumber(),
- o -> user.setInternationaliSDNNumber(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrState(), o -> user.setState(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrEmployeeType(), o -> user.setEmployeeType(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrFacsimileTelephoneNumber(),
- o -> user.setFacsimileTelephoneNumber(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrPostOfficeBox(), o -> user.setPostOfficeBox(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrInitials(), o -> user.setInitials(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrCarLicense(), o -> user.setCarLicense(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrMobile(), o -> user.setMobile(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrPostalAddress(), o -> user.setPostalAddress(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrCity(), o -> user.setCity(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrTeletexTerminalIdentifier(),
- o -> user.setTeletexTerminalIdentifier(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrX121Address(), o -> user.setX121Address(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrBusinessCategory(), o -> user.setBusinessCategory(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrRegisteredAddress(), o -> user.setRegisteredAddress(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrDisplayName(), o -> user.setDisplayName(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrPreferredLanguage(), o -> user.setPreferredLanguage(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrDepartmentNumber(), o -> user.setDepartmentNumber(o.toString()));
- setAttributeValue(result, fessConfig.getLdapAttrUidNumber(), o -> user.setUidNumber(DfTypeUtil.toLong(o)));
- setAttributeValue(result, fessConfig.getLdapAttrGidNumber(), o -> user.setGidNumber(DfTypeUtil.toLong(o)));
- setAttributeValue(result, fessConfig.getLdapAttrHomeDirectory(), o -> user.setHomeDirectory(o.toString()));
- }
- });
+ search(fessConfig.getLdapAdminUserBaseDn(), fessConfig.getLdapAdminUserFilter(user.getName()), null, adminEnv, result -> {
+ if (!result.isEmpty()) {
+ setAttributeValue(result, fessConfig.getLdapAttrSurname(), o -> user.setSurname(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrGivenName(), o -> user.setGivenName(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrMail(), o -> user.setMail(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrEmployeeNumber(), o -> user.setEmployeeNumber(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrTelephoneNumber(), o -> user.setTelephoneNumber(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrHomePhone(), o -> user.setHomePhone(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrHomePostalAddress(), o -> user.setHomePostalAddress(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrLabeleduri(), o -> user.setLabeledURI(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrRoomNumber(), o -> user.setRoomNumber(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrDescription(), o -> user.setDescription(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrTitle(), o -> user.setTitle(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrPager(), o -> user.setPager(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrStreet(), o -> user.setStreet(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrPostalCode(), o -> user.setPostalCode(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrPhysicalDeliveryOfficeName(),
+ o -> user.setPhysicalDeliveryOfficeName(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrDestinationIndicator(), o -> user.setDestinationIndicator(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrInternationalisdnNumber(),
+ o -> user.setInternationaliSDNNumber(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrState(), o -> user.setState(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrEmployeeType(), o -> user.setEmployeeType(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrFacsimileTelephoneNumber(),
+ o -> user.setFacsimileTelephoneNumber(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrPostOfficeBox(), o -> user.setPostOfficeBox(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrInitials(), o -> user.setInitials(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrCarLicense(), o -> user.setCarLicense(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrMobile(), o -> user.setMobile(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrPostalAddress(), o -> user.setPostalAddress(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrCity(), o -> user.setCity(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrTeletexTerminalIdentifier(),
+ o -> user.setTeletexTerminalIdentifier(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrX121Address(), o -> user.setX121Address(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrBusinessCategory(), o -> user.setBusinessCategory(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrRegisteredAddress(), o -> user.setRegisteredAddress(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrDisplayName(), o -> user.setDisplayName(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrPreferredLanguage(), o -> user.setPreferredLanguage(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrDepartmentNumber(), o -> user.setDepartmentNumber(o.toString()));
+ setAttributeValue(result, fessConfig.getLdapAttrUidNumber(), o -> user.setUidNumber(DfTypeUtil.toLong(o)));
+ setAttributeValue(result, fessConfig.getLdapAttrGidNumber(), o -> user.setGidNumber(DfTypeUtil.toLong(o)));
+ setAttributeValue(result, fessConfig.getLdapAttrHomeDirectory(), o -> user.setHomeDirectory(o.toString()));
+ }
+ });
// groups and roles
search(fessConfig.getLdapAdminUserBaseDn(), fessConfig.getLdapAdminUserFilter(user.getName()),
@@ -462,11 +457,8 @@ public class LdapManager {
});
// groups and roles
- search(fessConfig.getLdapAdminUserBaseDn(),
- fessConfig.getLdapAdminUserFilter(user.getName()),
- new String[] { fessConfig.getLdapMemberofAttribute() },
- adminEnv,
- result -> {
+ search(fessConfig.getLdapAdminUserBaseDn(), fessConfig.getLdapAdminUserFilter(user.getName()),
+ new String[] { fessConfig.getLdapMemberofAttribute() }, adminEnv, result -> {
if (!result.isEmpty()) {
final List<String> oldGroupList = new ArrayList<>();
final List<String> oldRoleList = new ArrayList<>();
@@ -487,31 +479,29 @@ public class LdapManager {
newGroupList.remove(name);
}
}));
- oldGroupList.stream().forEach(
- name -> {
- search(fessConfig.getLdapAdminGroupBaseDn(), fessConfig.getLdapAdminGroupFilter(name), null, adminEnv,
- subResult -> {
- if (!subResult.isEmpty()) {
- final List<ModificationItem> modifyList = new ArrayList<>();
- modifyDeleteEntry(modifyList, "member", userDN);
- modify(fessConfig.getLdapAdminGroupSecurityPrincipal(name), modifyList, adminEnv);
- }
- });
- });
- newGroupList.stream().forEach(
- name -> {
- search(fessConfig.getLdapAdminGroupBaseDn(), fessConfig.getLdapAdminGroupFilter(name), null, adminEnv,
- subResult -> {
- if (subResult.isEmpty()) {
- final Group group = new Group();
- group.setName(name);
- insert(group);
- }
- final List<ModificationItem> modifyList = new ArrayList<>();
- modifyAddEntry(modifyList, "member", userDN);
- modify(fessConfig.getLdapAdminGroupSecurityPrincipal(name), modifyList, adminEnv);
- });
- });
+ oldGroupList.stream().forEach(name -> {
+ search(fessConfig.getLdapAdminGroupBaseDn(), fessConfig.getLdapAdminGroupFilter(name), null, adminEnv,
+ subResult -> {
+ if (!subResult.isEmpty()) {
+ final List<ModificationItem> modifyList = new ArrayList<>();
+ modifyDeleteEntry(modifyList, "member", userDN);
+ modify(fessConfig.getLdapAdminGroupSecurityPrincipal(name), modifyList, adminEnv);
+ }
+ });
+ });
+ newGroupList.stream().forEach(name -> {
+ search(fessConfig.getLdapAdminGroupBaseDn(), fessConfig.getLdapAdminGroupFilter(name), null, adminEnv,
+ subResult -> {
+ if (subResult.isEmpty()) {
+ final Group group = new Group();
+ group.setName(name);
+ insert(group);
+ }
+ final List<ModificationItem> modifyList = new ArrayList<>();
+ modifyAddEntry(modifyList, "member", userDN);
+ modify(fessConfig.getLdapAdminGroupSecurityPrincipal(name), modifyList, adminEnv);
+ });
+ });
final List<String> newRoleList = stream(user.getRoleNames()).get(stream -> stream.collect(Collectors.toList()));
stream(user.getRoleNames()).of(stream -> stream.forEach(name -> {
@@ -520,61 +510,57 @@ public class LdapManager {
newRoleList.remove(name);
}
}));
- oldRoleList.stream().forEach(
- name -> {
- search(fessConfig.getLdapAdminRoleBaseDn(), fessConfig.getLdapAdminRoleFilter(name), null, adminEnv,
- subResult -> {
- if (!subResult.isEmpty()) {
- final List<ModificationItem> modifyList = new ArrayList<>();
- modifyDeleteEntry(modifyList, "member", userDN);
- modify(fessConfig.getLdapAdminRoleSecurityPrincipal(name), modifyList, adminEnv);
- }
- });
- });
- newRoleList.stream().forEach(
- name -> {
- search(fessConfig.getLdapAdminRoleBaseDn(), fessConfig.getLdapAdminRoleFilter(name), null, adminEnv,
- subResult -> {
- if (subResult.isEmpty()) {
- final Role role = new Role();
- role.setName(name);
- insert(role);
- }
- final List<ModificationItem> modifyList = new ArrayList<>();
- modifyAddEntry(modifyList, "member", userDN);
- modify(fessConfig.getLdapAdminRoleSecurityPrincipal(name), modifyList, adminEnv);
- });
- });
+ oldRoleList.stream().forEach(name -> {
+ search(fessConfig.getLdapAdminRoleBaseDn(), fessConfig.getLdapAdminRoleFilter(name), null, adminEnv,
+ subResult -> {
+ if (!subResult.isEmpty()) {
+ final List<ModificationItem> modifyList = new ArrayList<>();
+ modifyDeleteEntry(modifyList, "member", userDN);
+ modify(fessConfig.getLdapAdminRoleSecurityPrincipal(name), modifyList, adminEnv);
+ }
+ });
+ });
+ newRoleList.stream().forEach(name -> {
+ search(fessConfig.getLdapAdminRoleBaseDn(), fessConfig.getLdapAdminRoleFilter(name), null, adminEnv,
+ subResult -> {
+ if (subResult.isEmpty()) {
+ final Role role = new Role();
+ role.setName(name);
+ insert(role);
+ }
+ final List<ModificationItem> modifyList = new ArrayList<>();
+ modifyAddEntry(modifyList, "member", userDN);
+ modify(fessConfig.getLdapAdminRoleSecurityPrincipal(name), modifyList, adminEnv);
+ });
+ });
} else {
- stream(user.getGroupNames()).of(
- stream -> stream.forEach(name -> {
- search(fessConfig.getLdapAdminGroupBaseDn(), fessConfig.getLdapAdminGroupFilter(name), null, adminEnv,
- subResult -> {
- if (subResult.isEmpty()) {
- final Group group = new Group();
- group.setName(name);
- insert(group);
- }
- final List<ModificationItem> modifyList = new ArrayList<>();
- modifyAddEntry(modifyList, "member", userDN);
- modify(fessConfig.getLdapAdminGroupSecurityPrincipal(name), modifyList, adminEnv);
- });
- }));
-
- stream(user.getRoleNames()).of(
- stream -> stream.forEach(name -> {
- search(fessConfig.getLdapAdminRoleBaseDn(), fessConfig.getLdapAdminRoleFilter(name), null, adminEnv,
- subResult -> {
- if (subResult.isEmpty()) {
- final Role role = new Role();
- role.setName(name);
- insert(role);
- }
- final List<ModificationItem> modifyList = new ArrayList<>();
- modifyAddEntry(modifyList, "member", userDN);
- modify(fessConfig.getLdapAdminRoleSecurityPrincipal(name), modifyList, adminEnv);
- });
- }));
+ stream(user.getGroupNames()).of(stream -> stream.forEach(name -> {
+ search(fessConfig.getLdapAdminGroupBaseDn(), fessConfig.getLdapAdminGroupFilter(name), null, adminEnv,
+ subResult -> {
+ if (subResult.isEmpty()) {
+ final Group group = new Group();
+ group.setName(name);
+ insert(group);
+ }
+ final List<ModificationItem> modifyList = new ArrayList<>();
+ modifyAddEntry(modifyList, "member", userDN);
+ modify(fessConfig.getLdapAdminGroupSecurityPrincipal(name), modifyList, adminEnv);
+ });
+ }));
+
+ stream(user.getRoleNames()).of(stream -> stream.forEach(name -> {
+ search(fessConfig.getLdapAdminRoleBaseDn(), fessConfig.getLdapAdminRoleFilter(name), null, adminEnv,
+ subResult -> {
+ if (subResult.isEmpty()) {
+ final Role role = new Role();
+ role.setName(name);
+ insert(role);
+ }
+ final List<ModificationItem> modifyList = new ArrayList<>();
+ modifyAddEntry(modifyList, "member", userDN);
+ modify(fessConfig.getLdapAdminRoleSecurityPrincipal(name), modifyList, adminEnv);
+ });
+ }));
}
});
@@ -588,238 +574,169 @@ public class LdapManager {
}
final String attrSurname = fessConfig.getLdapAttrSurname();
- OptionalUtil
- .ofNullable(user.getSurname())
- .filter(StringUtil::isNotBlank)
- .ifPresent(s -> modifyReplaceEntry(modifyList, attrSurname, s))
- .orElse(() -> getAttributeValueList(result, attrSurname).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrSurname, v)));
+ OptionalUtil.ofNullable(user.getSurname()).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(StringUtil::isNotBlank)
- .ifPresent(s -> modifyReplaceEntry(modifyList, attrGivenName, s))
- .orElse(() -> getAttributeValueList(result, attrGivenName).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrGivenName, v)));
+ OptionalUtil.ofNullable(user.getGivenName()).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(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(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getEmployeeNumber()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrEmployeeNumber, s))
- .orElse(() -> getAttributeValueList(result, attrEmployeeNumber).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrEmployeeNumber, v)));
+ .orElse(() -> getAttributeValueList(result, attrEmployeeNumber).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrEmployeeNumber, v)));
final String attrTelephoneNumber = fessConfig.getLdapAttrTelephoneNumber();
- OptionalUtil
- .ofNullable(user.getTelephoneNumber())
- .filter(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getTelephoneNumber()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrTelephoneNumber, s))
- .orElse(() -> getAttributeValueList(result, attrTelephoneNumber).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrTelephoneNumber, v)));
+ .orElse(() -> getAttributeValueList(result, attrTelephoneNumber).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrTelephoneNumber, v)));
final String attrHomePhone = fessConfig.getLdapAttrHomePhone();
- OptionalUtil
- .ofNullable(user.getHomePhone())
- .filter(StringUtil::isNotBlank)
- .ifPresent(s -> modifyReplaceEntry(modifyList, attrHomePhone, s))
- .orElse(() -> getAttributeValueList(result, attrHomePhone).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrHomePhone, v)));
+ OptionalUtil.ofNullable(user.getHomePhone()).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(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getHomePostalAddress()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrHomePostalAddress, s))
- .orElse(() -> getAttributeValueList(result, attrHomePostalAddress).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrHomePostalAddress, v)));
+ .orElse(() -> getAttributeValueList(result, attrHomePostalAddress).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrHomePostalAddress, v)));
final String attrLabeledURI = fessConfig.getLdapAttrLabeleduri();
- OptionalUtil
- .ofNullable(user.getLabeledURI())
- .filter(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getLabeledURI()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrLabeledURI, s))
- .orElse(() -> getAttributeValueList(result, attrLabeledURI).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrLabeledURI, v)));
+ .orElse(() -> getAttributeValueList(result, attrLabeledURI).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrLabeledURI, v)));
final String attrRoomNumber = fessConfig.getLdapAttrRoomNumber();
- OptionalUtil
- .ofNullable(user.getRoomNumber())
- .filter(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getRoomNumber()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrRoomNumber, s))
- .orElse(() -> getAttributeValueList(result, attrRoomNumber).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrRoomNumber, v)));
+ .orElse(() -> getAttributeValueList(result, attrRoomNumber).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrRoomNumber, v)));
final String attrDescription = fessConfig.getLdapAttrDescription();
- OptionalUtil
- .ofNullable(user.getDescription())
- .filter(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getDescription()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrDescription, s))
- .orElse(() -> getAttributeValueList(result, attrDescription).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrDescription, v)));
+ .orElse(() -> getAttributeValueList(result, attrDescription).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrDescription, v)));
final String attrTitle = fessConfig.getLdapAttrTitle();
- OptionalUtil.ofNullable(user.getTitle()).filter(StringUtil::isNotBlank)
- .ifPresent(s -> modifyReplaceEntry(modifyList, attrTitle, 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(StringUtil::isNotBlank)
- .ifPresent(s -> modifyReplaceEntry(modifyList, attrPager, 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(StringUtil::isNotBlank)
- .ifPresent(s -> modifyReplaceEntry(modifyList, attrStreet, s))
- .orElse(() -> getAttributeValueList(result, attrStreet).stream().forEach(v -> modifyDeleteEntry(modifyList, attrStreet, v)));
+ OptionalUtil.ofNullable(user.getStreet()).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(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getPostalCode()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrPostalCode, s))
- .orElse(() -> getAttributeValueList(result, attrPostalCode).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrPostalCode, v)));
+ .orElse(() -> getAttributeValueList(result, attrPostalCode).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrPostalCode, v)));
final String attrPhysicalDeliveryOfficeName = fessConfig.getLdapAttrPhysicalDeliveryOfficeName();
- OptionalUtil
- .ofNullable(user.getPhysicalDeliveryOfficeName())
- .filter(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getPhysicalDeliveryOfficeName()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrPhysicalDeliveryOfficeName, s))
- .orElse(() -> getAttributeValueList(result, attrPhysicalDeliveryOfficeName).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrPhysicalDeliveryOfficeName, v)));
+ .orElse(() -> getAttributeValueList(result, attrPhysicalDeliveryOfficeName).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrPhysicalDeliveryOfficeName, v)));
final String attrDestinationIndicator = fessConfig.getLdapAttrDestinationIndicator();
- OptionalUtil
- .ofNullable(user.getDestinationIndicator())
- .filter(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getDestinationIndicator()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrDestinationIndicator, s))
- .orElse(() -> getAttributeValueList(result, attrDestinationIndicator).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrDestinationIndicator, v)));
+ .orElse(() -> getAttributeValueList(result, attrDestinationIndicator).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrDestinationIndicator, v)));
final String attrInternationaliSDNNumber = fessConfig.getLdapAttrInternationalisdnNumber();
- OptionalUtil
- .ofNullable(user.getInternationaliSDNNumber())
- .filter(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getInternationaliSDNNumber()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrInternationaliSDNNumber, s))
- .orElse(() -> getAttributeValueList(result, attrInternationaliSDNNumber).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrInternationaliSDNNumber, v)));
+ .orElse(() -> getAttributeValueList(result, attrInternationaliSDNNumber).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrInternationaliSDNNumber, v)));
final String attrState = fessConfig.getLdapAttrState();
- OptionalUtil.ofNullable(user.getState()).filter(StringUtil::isNotBlank)
- .ifPresent(s -> modifyReplaceEntry(modifyList, attrState, 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(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getEmployeeType()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrEmployeeType, s))
- .orElse(() -> getAttributeValueList(result, attrEmployeeType).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrEmployeeType, v)));
+ .orElse(() -> getAttributeValueList(result, attrEmployeeType).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrEmployeeType, v)));
final String attrFacsimileTelephoneNumber = fessConfig.getLdapAttrFacsimileTelephoneNumber();
- OptionalUtil
- .ofNullable(user.getFacsimileTelephoneNumber())
- .filter(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getFacsimileTelephoneNumber()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrFacsimileTelephoneNumber, s))
- .orElse(() -> getAttributeValueList(result, attrFacsimileTelephoneNumber).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrFacsimileTelephoneNumber, v)));
+ .orElse(() -> getAttributeValueList(result, attrFacsimileTelephoneNumber).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrFacsimileTelephoneNumber, v)));
final String attrPostOfficeBox = fessConfig.getLdapAttrPostOfficeBox();
- OptionalUtil
- .ofNullable(user.getPostOfficeBox())
- .filter(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getPostOfficeBox()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrPostOfficeBox, s))
- .orElse(() -> getAttributeValueList(result, attrPostOfficeBox).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrPostOfficeBox, v)));
+ .orElse(() -> getAttributeValueList(result, attrPostOfficeBox).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrPostOfficeBox, v)));
final String attrInitials = fessConfig.getLdapAttrInitials();
- OptionalUtil
- .ofNullable(user.getInitials())
- .filter(StringUtil::isNotBlank)
- .ifPresent(s -> modifyReplaceEntry(modifyList, attrInitials, s))
- .orElse(() -> getAttributeValueList(result, attrInitials).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrInitials, v)));
+ OptionalUtil.ofNullable(user.getInitials()).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(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getCarLicense()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrCarLicense, s))
- .orElse(() -> getAttributeValueList(result, attrCarLicense).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrCarLicense, v)));
+ .orElse(() -> getAttributeValueList(result, attrCarLicense).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrCarLicense, v)));
final String attrMobile = fessConfig.getLdapAttrMobile();
- OptionalUtil
- .ofNullable(user.getMobile())
- .filter(StringUtil::isNotBlank)
- .ifPresent(s -> modifyReplaceEntry(modifyList, attrMobile, s))
- .orElse(() -> getAttributeValueList(result, attrMobile).stream().forEach(v -> modifyDeleteEntry(modifyList, attrMobile, v)));
+ OptionalUtil.ofNullable(user.getMobile()).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(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getPostalAddress()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrPostalAddress, s))
- .orElse(() -> getAttributeValueList(result, attrPostalAddress).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrPostalAddress, v)));
+ .orElse(() -> getAttributeValueList(result, attrPostalAddress).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrPostalAddress, v)));
final String attrCity = fessConfig.getLdapAttrCity();
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(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getTeletexTerminalIdentifier()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrTeletexTerminalIdentifier, s))
- .orElse(() -> getAttributeValueList(result, attrTeletexTerminalIdentifier).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrTeletexTerminalIdentifier, v)));
+ .orElse(() -> getAttributeValueList(result, attrTeletexTerminalIdentifier).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrTeletexTerminalIdentifier, v)));
final String attrX121Address = fessConfig.getLdapAttrX121Address();
- OptionalUtil
- .ofNullable(user.getX121Address())
- .filter(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getX121Address()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrX121Address, s))
- .orElse(() -> getAttributeValueList(result, attrX121Address).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrX121Address, v)));
+ .orElse(() -> getAttributeValueList(result, attrX121Address).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrX121Address, v)));
final String attrBusinessCategory = fessConfig.getLdapAttrBusinessCategory();
- OptionalUtil
- .ofNullable(user.getBusinessCategory())
- .filter(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getBusinessCategory()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrBusinessCategory, s))
- .orElse(() -> getAttributeValueList(result, attrBusinessCategory).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrBusinessCategory, v)));
+ .orElse(() -> getAttributeValueList(result, attrBusinessCategory).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrBusinessCategory, v)));
final String attrRegisteredAddress = fessConfig.getLdapAttrRegisteredAddress();
- OptionalUtil
- .ofNullable(user.getRegisteredAddress())
- .filter(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getRegisteredAddress()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrRegisteredAddress, s))
- .orElse(() -> getAttributeValueList(result, attrRegisteredAddress).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrRegisteredAddress, v)));
+ .orElse(() -> getAttributeValueList(result, attrRegisteredAddress).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrRegisteredAddress, v)));
final String attrDisplayName = fessConfig.getLdapAttrDisplayName();
- OptionalUtil
- .ofNullable(user.getDisplayName())
- .filter(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getDisplayName()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrDisplayName, s))
- .orElse(() -> getAttributeValueList(result, attrDisplayName).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrDisplayName, v)));
+ .orElse(() -> getAttributeValueList(result, attrDisplayName).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrDisplayName, v)));
final String attrPreferredLanguage = fessConfig.getLdapAttrPreferredLanguage();
- OptionalUtil
- .ofNullable(user.getPreferredLanguage())
- .filter(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getPreferredLanguage()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrPreferredLanguage, s))
- .orElse(() -> getAttributeValueList(result, attrPreferredLanguage).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrPreferredLanguage, v)));
+ .orElse(() -> getAttributeValueList(result, attrPreferredLanguage).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrPreferredLanguage, v)));
final String attrDepartmentNumber = fessConfig.getLdapAttrDepartmentNumber();
- OptionalUtil
- .ofNullable(user.getDepartmentNumber())
- .filter(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getDepartmentNumber()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrDepartmentNumber, s))
- .orElse(() -> getAttributeValueList(result, attrDepartmentNumber).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrDepartmentNumber, v)));
+ .orElse(() -> getAttributeValueList(result, attrDepartmentNumber).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrDepartmentNumber, v)));
final String attrUidNumber = fessConfig.getLdapAttrUidNumber();
- OptionalUtil
- .ofNullable(user.getUidNumber())
- .filter(s -> StringUtil.isNotBlank(s.toString()))
+ OptionalUtil.ofNullable(user.getUidNumber()).filter(s -> StringUtil.isNotBlank(s.toString()))
.ifPresent(s -> modifyReplaceEntry(modifyList, attrUidNumber, s.toString()))
- .orElse(() -> getAttributeValueList(result, attrUidNumber).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrUidNumber, v)));
+ .orElse(() -> getAttributeValueList(result, attrUidNumber).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrUidNumber, v)));
final String attrGidNumber = fessConfig.getLdapAttrGidNumber();
- OptionalUtil
- .ofNullable(user.getGidNumber())
- .filter(s -> StringUtil.isNotBlank(s.toString()))
+ OptionalUtil.ofNullable(user.getGidNumber()).filter(s -> StringUtil.isNotBlank(s.toString()))
.ifPresent(s -> modifyReplaceEntry(modifyList, attrGidNumber, s.toString()))
- .orElse(() -> getAttributeValueList(result, attrGidNumber).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrGidNumber, v)));
+ .orElse(() -> getAttributeValueList(result, attrGidNumber).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrGidNumber, v)));
final String attrHomeDirectory = fessConfig.getLdapAttrHomeDirectory();
- OptionalUtil
- .ofNullable(user.getHomeDirectory())
- .filter(StringUtil::isNotBlank)
+ OptionalUtil.ofNullable(user.getHomeDirectory()).filter(StringUtil::isNotBlank)
.ifPresent(s -> modifyReplaceEntry(modifyList, attrHomeDirectory, s))
- .orElse(() -> getAttributeValueList(result, attrHomeDirectory).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrHomeDirectory, v)));
+ .orElse(() -> getAttributeValueList(result, attrHomeDirectory).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrHomeDirectory, v)));
modify(userDN, modifyList, adminEnv);
}
@@ -908,8 +825,8 @@ public class LdapManager {
final String attrUidNumber = fessConfig.getLdapAttrUidNumber();
final String attrGidNumber = fessConfig.getLdapAttrGidNumber();
- Stream.of(attrUidNumber, attrGidNumber).forEach(
- attrName -> OptionalUtil.ofNullable(attributes.get(attrName)).filter(StringUtil::isNotBlank).ifPresent(s -> {
+ Stream.of(attrUidNumber, attrGidNumber)
+ .forEach(attrName -> OptionalUtil.ofNullable(attributes.get(attrName)).filter(StringUtil::isNotBlank).ifPresent(s -> {
try {
DfTypeUtil.toLong(s);
} catch (final NumberFormatException e) {
@@ -1045,12 +962,10 @@ public class LdapManager {
final List<ModificationItem> modifyList = new ArrayList<>();
final String attrGidNumber = fessConfig.getLdapAttrGidNumber();
- OptionalUtil
- .ofNullable(group.getGidNumber())
- .filter(s -> StringUtil.isNotBlank(s.toString()))
+ OptionalUtil.ofNullable(group.getGidNumber()).filter(s -> StringUtil.isNotBlank(s.toString()))
.ifPresent(s -> modifyReplaceEntry(modifyList, attrGidNumber, s.toString()))
- .orElse(() -> getAttributeValueList(result, attrGidNumber).stream().forEach(
- v -> modifyDeleteEntry(modifyList, attrGidNumber, v)));
+ .orElse(() -> getAttributeValueList(result, attrGidNumber).stream()
+ .forEach(v -> modifyDeleteEntry(modifyList, attrGidNumber, v)));
modify(entryDN, modifyList, adminEnv);
}
@@ -1065,8 +980,8 @@ public class LdapManager {
// Long type attributes
final String attrGidNumber = fessConfig.getLdapAttrGidNumber();
- Stream.of(attrGidNumber).forEach(
- attrName -> OptionalUtil.ofNullable(attributes.get(attrName)).filter(StringUtil::isNotBlank).ifPresent(s -> {
+ Stream.of(attrGidNumber)
+ .forEach(attrName -> OptionalUtil.ofNullable(attributes.get(attrName)).filter(StringUtil::isNotBlank).ifPresent(s -> {
try {
DfTypeUtil.toLong(s);
} catch (final NumberFormatException e) {
diff --git a/src/main/java/org/codelibs/fess/ldap/LdapUser.java b/src/main/java/org/codelibs/fess/ldap/LdapUser.java
index 00c12cc27..096d09e6d 100644
--- a/src/main/java/org/codelibs/fess/ldap/LdapUser.java
+++ b/src/main/java/org/codelibs/fess/ldap/LdapUser.java
@@ -55,11 +55,10 @@ public class LdapUser implements FessUser {
final String accountFilter = fessConfig.getLdapAccountFilter();
final String groupFilter = fessConfig.getLdapGroupFilter();
if (StringUtil.isNotBlank(baseDn) && StringUtil.isNotBlank(accountFilter)) {
- permissions =
- ArrayUtils.addAll(ComponentUtil.getLdapManager().getRoles(this, baseDn, accountFilter, groupFilter, roles -> {
- permissions = roles;
- ComponentUtil.getActivityHelper().permissionChanged(OptionalThing.of(new FessUserBean(this)));
- }), fessConfig.getRoleSearchUserPrefix() + getName());
+ permissions = ArrayUtils.addAll(ComponentUtil.getLdapManager().getRoles(this, baseDn, accountFilter, groupFilter, roles -> {
+ permissions = roles;
+ ComponentUtil.getActivityHelper().permissionChanged(OptionalThing.of(new FessUserBean(this)));
+ }), fessConfig.getRoleSearchUserPrefix() + getName());
} else {
permissions = StringUtil.EMPTY_STRINGS;
}
@@ -70,17 +69,15 @@ public class LdapUser implements FessUser {
@Override
public String[] getRoleNames() {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
- return stream(getPermissions()).get(
- stream -> stream.filter(s -> s.startsWith(fessConfig.getRoleSearchRolePrefix())).map(s -> s.substring(1))
- .toArray(n -> new String[n]));
+ return stream(getPermissions()).get(stream -> stream.filter(s -> s.startsWith(fessConfig.getRoleSearchRolePrefix()))
+ .map(s -> s.substring(1)).toArray(n -> new String[n]));
}
@Override
public String[] getGroupNames() {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
- return stream(getPermissions()).get(
- stream -> stream.filter(s -> s.startsWith(fessConfig.getRoleSearchGroupPrefix())).map(s -> s.substring(1))
- .toArray(n -> new String[n]));
+ return stream(getPermissions()).get(stream -> stream.filter(s -> s.startsWith(fessConfig.getRoleSearchGroupPrefix()))
+ .map(s -> s.substring(1)).toArray(n -> new String[n]));
}
public Hashtable<String, String> getEnvironment() {
diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java b/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java
index b24fbd709..8e00efa33 100644
--- a/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java
+++ b/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java
@@ -133,24 +133,24 @@ public interface FessHtmlPath {
HtmlNext path_AdminDictProtwords_AdminDictProtwordsUploadJsp = new HtmlNext("/admin/dict/protwords/admin_dict_protwords_upload.jsp");
/** The path of the HTML: /admin/dict/stemmeroverride/admin_dict_stemmeroverride.jsp */
- HtmlNext path_AdminDictStemmeroverride_AdminDictStemmeroverrideJsp = new HtmlNext(
- "/admin/dict/stemmeroverride/admin_dict_stemmeroverride.jsp");
+ HtmlNext path_AdminDictStemmeroverride_AdminDictStemmeroverrideJsp =
+ new HtmlNext("/admin/dict/stemmeroverride/admin_dict_stemmeroverride.jsp");
/** The path of the HTML: /admin/dict/stemmeroverride/admin_dict_stemmeroverride_details.jsp */
- HtmlNext path_AdminDictStemmeroverride_AdminDictStemmeroverrideDetailsJsp = new HtmlNext(
- "/admin/dict/stemmeroverride/admin_dict_stemmeroverride_details.jsp");
+ HtmlNext path_AdminDictStemmeroverride_AdminDictStemmeroverrideDetailsJsp =
+ new HtmlNext("/admin/dict/stemmeroverride/admin_dict_stemmeroverride_details.jsp");
/** The path of the HTML: /admin/dict/stemmeroverride/admin_dict_stemmeroverride_download.jsp */
- HtmlNext path_AdminDictStemmeroverride_AdminDictStemmeroverrideDownloadJsp = new HtmlNext(
- "/admin/dict/stemmeroverride/admin_dict_stemmeroverride_download.jsp");
+ HtmlNext path_AdminDictStemmeroverride_AdminDictStemmeroverrideDownloadJsp =
+ new HtmlNext("/admin/dict/stemmeroverride/admin_dict_stemmeroverride_download.jsp");
/** The path of the HTML: /admin/dict/stemmeroverride/admin_dict_stemmeroverride_edit.jsp */
- HtmlNext path_AdminDictStemmeroverride_AdminDictStemmeroverrideEditJsp = new HtmlNext(
- "/admin/dict/stemmeroverride/admin_dict_stemmeroverride_edit.jsp");
+ HtmlNext path_AdminDictStemmeroverride_AdminDictStemmeroverrideEditJsp =
+ new HtmlNext("/admin/dict/stemmeroverride/admin_dict_stemmeroverride_edit.jsp");
/** The path of the HTML: /admin/dict/stemmeroverride/admin_dict_stemmeroverride_upload.jsp */
- HtmlNext path_AdminDictStemmeroverride_AdminDictStemmeroverrideUploadJsp = new HtmlNext(
- "/admin/dict/stemmeroverride/admin_dict_stemmeroverride_upload.jsp");
+ HtmlNext path_AdminDictStemmeroverride_AdminDictStemmeroverrideUploadJsp =
+ new HtmlNext("/admin/dict/stemmeroverride/admin_dict_stemmeroverride_upload.jsp");
/** The path of the HTML: /admin/dict/stopwords/admin_dict_stopwords.jsp */
HtmlNext path_AdminDictStopwords_AdminDictStopwordsJsp = new HtmlNext("/admin/dict/stopwords/admin_dict_stopwords.jsp");
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 e394eef67..4844795a0 100644
--- a/src/main/java/org/codelibs/fess/mylasta/action/FessUserBean.java
+++ b/src/main/java/org/codelibs/fess/mylasta/action/FessUserBean.java
@@ -77,8 +77,8 @@ public class FessUserBean extends TypicalUserBean<String> { // #change_it also L
}
public boolean hasRoles(final String[] acceptedRoles) {
- return stream(user.getRoleNames()).get(
- stream -> stream.anyMatch(s1 -> stream(acceptedRoles).get(s3 -> s3.anyMatch(s2 -> s2.equals(s1)))));
+ return stream(user.getRoleNames())
+ .get(stream -> stream.anyMatch(s1 -> stream(acceptedRoles).get(s3 -> s3.anyMatch(s2 -> s2.equals(s1)))));
}
public boolean hasGroup(final String group) {
@@ -86,8 +86,8 @@ public class FessUserBean extends TypicalUserBean<String> { // #change_it also L
}
public boolean hasGroups(final String[] acceptedGroups) {
- return stream(user.getGroupNames()).get(
- stream -> stream.anyMatch(s1 -> stream(acceptedGroups).get(s3 -> s3.anyMatch(s2 -> s2.equals(s1)))));
+ return stream(user.getGroupNames())
+ .get(stream -> stream.anyMatch(s1 -> stream(acceptedGroups).get(s3 -> s3.anyMatch(s2 -> s2.equals(s1)))));
}
public FessUser getFessUser() {
diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
index 3dd1a3c8c..4b5a5a89e 100644
--- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
+++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
@@ -9195,22 +9195,18 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
defaultMap.put(FessConfig.APP_DIGEST_ALGORISM, "sha256");
defaultMap.put(FessConfig.APP_ENCRYPT_PROPERTY_PATTERN, ".*password|.*key");
defaultMap.put(FessConfig.APP_EXTENSION_NAMES, "");
- defaultMap
- .put(FessConfig.JVM_CRAWLER_OPTIONS,
- "-Djava.awt.headless=true\n-Dfile.encoding=UTF-8\n-Djna.nosys=true\n-Djdk.io.permissionsUseCanonicalPath=true\n-Dhttp.maxConnections=20\n-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager\n-server\n-Xms128m\n-Xmx512m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:-HeapDumpOnOutOfMemoryError\n-XX:-OmitStackTraceInFastThrow\n-XX:+UnlockExperimentalVMOptions\n-XX:+UseG1GC\n-XX:InitiatingHeapOccupancyPercent=45\n-XX:G1HeapRegionSize=1m\n-XX:MaxGCPauseMillis=60000\n-XX:G1NewSizePercent=5\n-XX:G1MaxNewSizePercent=5\n-Djcifs.smb.client.responseTimeout=30000\n-Djcifs.smb.client.soTimeout=35000\n-Djcifs.smb.client.connTimeout=60000\n-Djcifs.smb.client.sessionTimeout=60000\n-Djcifs.smb1.smb.client.connTimeout=60000\n-Djcifs.smb1.smb.client.soTimeout=35000\n-Djcifs.smb1.smb.client.responseTimeout=30000\n-Dgroovy.use.classvalue=true\n-Dio.netty.noUnsafe=true\n-Dio.netty.noKeySetOptimization=true\n-Dio.netty.recycler.maxCapacityPerThread=0\n-Dlog4j.shutdownHookEnabled=false\n-Dlog4j2.disable.jmx=true\n-Dlog4j.skipJansi=true\n-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider\n-Dorg.apache.pdfbox.rendering.UsePureJavaCMYKConversion=true\n");
- defaultMap
- .put(FessConfig.JVM_SUGGEST_OPTIONS,
- "-Djava.awt.headless=true\n-Dfile.encoding=UTF-8\n-Djna.nosys=true\n-Djdk.io.permissionsUseCanonicalPath=true\n-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager\n-server\n-Xms128m\n-Xmx256m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:-HeapDumpOnOutOfMemoryError\n-XX:+UnlockExperimentalVMOptions\n-XX:+UseG1GC\n-XX:InitiatingHeapOccupancyPercent=45\n-XX:G1HeapRegionSize=1m\n-XX:MaxGCPauseMillis=60000\n-XX:G1NewSizePercent=5\n-XX:G1MaxNewSizePercent=30\n-Dgroovy.use.classvalue=true\n-Dio.netty.noUnsafe=true\n-Dio.netty.noKeySetOptimization=true\n-Dio.netty.recycler.maxCapacityPerThread=0\n-Dlog4j.shutdownHookEnabled=false\n-Dlog4j2.disable.jmx=true\n-Dlog4j.skipJansi=true\n");
- defaultMap
- .put(FessConfig.JVM_THUMBNAIL_OPTIONS,
- "-Djava.awt.headless=true\n-Dfile.encoding=UTF-8\n-Djna.nosys=true\n-Djdk.io.permissionsUseCanonicalPath=true\n-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager\n-server\n-Xms128m\n-Xmx256m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:-HeapDumpOnOutOfMemoryError\n-XX:-OmitStackTraceInFastThrow\n-XX:+UnlockExperimentalVMOptions\n-XX:+UseG1GC\n-XX:InitiatingHeapOccupancyPercent=45\n-XX:G1HeapRegionSize=4m\n-XX:MaxGCPauseMillis=60000\n-XX:G1NewSizePercent=5\n-XX:G1MaxNewSizePercent=50\n-Djcifs.smb.client.responseTimeout=30000\n-Djcifs.smb.client.soTimeout=35000\n-Djcifs.smb.client.connTimeout=60000\n-Djcifs.smb.client.sessionTimeout=60000\n-Djcifs.smb1.smb.client.connTimeout=60000\n-Djcifs.smb1.smb.client.soTimeout=35000\n-Djcifs.smb1.smb.client.responseTimeout=30000\n-Dgroovy.use.classvalue=true\n-Dio.netty.noUnsafe=true\n-Dio.netty.noKeySetOptimization=true\n-Dio.netty.recycler.maxCapacityPerThread=0\n-Dlog4j.shutdownHookEnabled=false\n-Dlog4j2.disable.jmx=true\n-Dlog4j.skipJansi=true\n-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider\n-Dorg.apache.pdfbox.rendering.UsePureJavaCMYKConversion=true\n");
+ defaultMap.put(FessConfig.JVM_CRAWLER_OPTIONS,
+ "-Djava.awt.headless=true\n-Dfile.encoding=UTF-8\n-Djna.nosys=true\n-Djdk.io.permissionsUseCanonicalPath=true\n-Dhttp.maxConnections=20\n-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager\n-server\n-Xms128m\n-Xmx512m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:-HeapDumpOnOutOfMemoryError\n-XX:-OmitStackTraceInFastThrow\n-XX:+UnlockExperimentalVMOptions\n-XX:+UseG1GC\n-XX:InitiatingHeapOccupancyPercent=45\n-XX:G1HeapRegionSize=1m\n-XX:MaxGCPauseMillis=60000\n-XX:G1NewSizePercent=5\n-XX:G1MaxNewSizePercent=5\n-Djcifs.smb.client.responseTimeout=30000\n-Djcifs.smb.client.soTimeout=35000\n-Djcifs.smb.client.connTimeout=60000\n-Djcifs.smb.client.sessionTimeout=60000\n-Djcifs.smb1.smb.client.connTimeout=60000\n-Djcifs.smb1.smb.client.soTimeout=35000\n-Djcifs.smb1.smb.client.responseTimeout=30000\n-Dgroovy.use.classvalue=true\n-Dio.netty.noUnsafe=true\n-Dio.netty.noKeySetOptimization=true\n-Dio.netty.recycler.maxCapacityPerThread=0\n-Dlog4j.shutdownHookEnabled=false\n-Dlog4j2.disable.jmx=true\n-Dlog4j.skipJansi=true\n-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider\n-Dorg.apache.pdfbox.rendering.UsePureJavaCMYKConversion=true\n");
+ defaultMap.put(FessConfig.JVM_SUGGEST_OPTIONS,
+ "-Djava.awt.headless=true\n-Dfile.encoding=UTF-8\n-Djna.nosys=true\n-Djdk.io.permissionsUseCanonicalPath=true\n-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager\n-server\n-Xms128m\n-Xmx256m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:-HeapDumpOnOutOfMemoryError\n-XX:+UnlockExperimentalVMOptions\n-XX:+UseG1GC\n-XX:InitiatingHeapOccupancyPercent=45\n-XX:G1HeapRegionSize=1m\n-XX:MaxGCPauseMillis=60000\n-XX:G1NewSizePercent=5\n-XX:G1MaxNewSizePercent=30\n-Dgroovy.use.classvalue=true\n-Dio.netty.noUnsafe=true\n-Dio.netty.noKeySetOptimization=true\n-Dio.netty.recycler.maxCapacityPerThread=0\n-Dlog4j.shutdownHookEnabled=false\n-Dlog4j2.disable.jmx=true\n-Dlog4j.skipJansi=true\n");
+ defaultMap.put(FessConfig.JVM_THUMBNAIL_OPTIONS,
+ "-Djava.awt.headless=true\n-Dfile.encoding=UTF-8\n-Djna.nosys=true\n-Djdk.io.permissionsUseCanonicalPath=true\n-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager\n-server\n-Xms128m\n-Xmx256m\n-XX:MaxMetaspaceSize=128m\n-XX:CompressedClassSpaceSize=32m\n-XX:-UseGCOverheadLimit\n-XX:+UseTLAB\n-XX:+DisableExplicitGC\n-XX:-HeapDumpOnOutOfMemoryError\n-XX:-OmitStackTraceInFastThrow\n-XX:+UnlockExperimentalVMOptions\n-XX:+UseG1GC\n-XX:InitiatingHeapOccupancyPercent=45\n-XX:G1HeapRegionSize=4m\n-XX:MaxGCPauseMillis=60000\n-XX:G1NewSizePercent=5\n-XX:G1MaxNewSizePercent=50\n-Djcifs.smb.client.responseTimeout=30000\n-Djcifs.smb.client.soTimeout=35000\n-Djcifs.smb.client.connTimeout=60000\n-Djcifs.smb.client.sessionTimeout=60000\n-Djcifs.smb1.smb.client.connTimeout=60000\n-Djcifs.smb1.smb.client.soTimeout=35000\n-Djcifs.smb1.smb.client.responseTimeout=30000\n-Dgroovy.use.classvalue=true\n-Dio.netty.noUnsafe=true\n-Dio.netty.noKeySetOptimization=true\n-Dio.netty.recycler.maxCapacityPerThread=0\n-Dlog4j.shutdownHookEnabled=false\n-Dlog4j2.disable.jmx=true\n-Dlog4j.skipJansi=true\n-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider\n-Dorg.apache.pdfbox.rendering.UsePureJavaCMYKConversion=true\n");
defaultMap.put(FessConfig.JOB_SYSTEM_JOB_IDS, "default_crawler");
defaultMap.put(FessConfig.JOB_TEMPLATE_TITLE_WEB, "Web Crawler - {0}");
defaultMap.put(FessConfig.JOB_TEMPLATE_TITLE_FILE, "File Crawler - {0}");
defaultMap.put(FessConfig.JOB_TEMPLATE_TITLE_DATA, "Data Crawler - {0}");
- defaultMap
- .put(FessConfig.JOB_TEMPLATE_SCRIPT,
- "return container.getComponent(\"crawlJob\").logLevel(\"info\").sessionId(\"{3}\").webConfigIds([{0}] as String[]).fileConfigIds([{1}] as String[]).dataConfigIds([{2}] as String[]).jobExecutor(executor).execute();");
+ defaultMap.put(FessConfig.JOB_TEMPLATE_SCRIPT,
+ "return container.getComponent(\"crawlJob\").logLevel(\"info\").sessionId(\"{3}\").webConfigIds([{0}] as String[]).fileConfigIds([{1}] as String[]).dataConfigIds([{2}] as String[]).jobExecutor(executor).execute();");
defaultMap.put(FessConfig.JOB_MAX_CRAWLER_PROCESSES, "0");
defaultMap.put(FessConfig.PROCESSORS, "0");
defaultMap.put(FessConfig.JAVA_COMMAND_PATH, "java");
@@ -9222,9 +9218,8 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
defaultMap.put(FessConfig.SUPPORTED_UPLOADED_CSS_EXTENTIONS, "css");
defaultMap.put(FessConfig.SUPPORTED_UPLOADED_MEDIA_EXTENTIONS, "jpg,jpeg,gif,png,swf");
defaultMap.put(FessConfig.SUPPORTED_UPLOADED_FILES, "license.properties");
- defaultMap
- .put(FessConfig.SUPPORTED_LANGUAGES,
- "ar,bg,bn,ca,ckb_IQ,cs,da,de,el,en_IE,en,es,et,eu,fa,fi,fr,gl,gu,he,hi,hr,hu,hy,id,it,ja,ko,lt,lv,mk,ml,nl,no,pa,pl,pt_BR,pt,ro,ru,si,sq,sv,ta,te,th,tl,tr,uk,ur,vi,zh_CN,zh_TW,zh");
+ defaultMap.put(FessConfig.SUPPORTED_LANGUAGES,
+ "ar,bg,bn,ca,ckb_IQ,cs,da,de,el,en_IE,en,es,et,eu,fa,fi,fr,gl,gu,he,hi,hr,hu,hy,id,it,ja,ko,lt,lv,mk,ml,nl,no,pa,pl,pt_BR,pt,ro,ru,si,sq,sv,ta,te,th,tl,tr,uk,ur,vi,zh_CN,zh_TW,zh");
defaultMap.put(FessConfig.API_ACCESS_TOKEN_LENGTH, "60");
defaultMap.put(FessConfig.API_ACCESS_TOKEN_REQUIRED, "false");
defaultMap.put(FessConfig.API_ACCESS_TOKEN_REQUEST_PARAMETER, "");
@@ -9255,9 +9250,8 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
defaultMap.put(FessConfig.CRAWLER_DOCUMENT_MAX_ALPHANUM_TERM_SIZE, "20");
defaultMap.put(FessConfig.CRAWLER_DOCUMENT_MAX_SYMBOL_TERM_SIZE, "10");
defaultMap.put(FessConfig.CRAWLER_DOCUMENT_DUPLICATE_TERM_REMOVED, "false");
- defaultMap
- .put(FessConfig.CRAWLER_DOCUMENT_SPACE_CHARS,
- "u0009u000Au000Bu000Cu000Du001Cu001Du001Eu001Fu0020u00A0u1680u180Eu2000u2001u2002u2003u2004u2005u2006u2007u2008u2009u200Au200Bu200Cu202Fu205Fu3000uFEFFuFFFDu00B6");
+ defaultMap.put(FessConfig.CRAWLER_DOCUMENT_SPACE_CHARS,
+ "u0009u000Au000Bu000Cu000Du001Cu001Du001Eu001Fu0020u00A0u1680u180Eu2000u2001u2002u2003u2004u2005u2006u2007u2008u2009u200Au200Bu200Cu202Fu205Fu3000uFEFFuFFFDu00B6");
defaultMap.put(FessConfig.CRAWLER_DOCUMENT_FULLSTOP_CHARS, "u002eu06d4u2e3cu3002");
defaultMap.put(FessConfig.CRAWLER_CRAWLING_DATA_ENCODING, "UTF-8");
defaultMap.put(FessConfig.CRAWLER_WEB_PROTOCOLS, "http,https");
@@ -9377,9 +9371,8 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
defaultMap.put(FessConfig.INDEX_DELETE_TIMEOUT, "3m");
defaultMap.put(FessConfig.INDEX_HEALTH_TIMEOUT, "10m");
defaultMap.put(FessConfig.INDEX_INDICES_TIMEOUT, "1m");
- defaultMap
- .put(FessConfig.INDEX_FILETYPE,
- "text/html=html\napplication/msword=word\napplication/vnd.openxmlformats-officedocument.wordprocessingml.document=word\napplication/vnd.ms-excel=excel\napplication/vnd.ms-excel.sheet.2=excel\napplication/vnd.ms-excel.sheet.3=excel\napplication/vnd.ms-excel.sheet.4=excel\napplication/vnd.ms-excel.workspace.3=excel\napplication/vnd.ms-excel.workspace.4=excel\napplication/vnd.openxmlformats-officedocument.spreadsheetml.sheet=excel\napplication/vnd.ms-powerpoint=powerpoint\napplication/vnd.openxmlformats-officedocument.presentationml.presentation=powerpoint\napplication/vnd.oasis.opendocument.text=odt\napplication/vnd.oasis.opendocument.spreadsheet=ods\napplication/vnd.oasis.opendocument.presentation=odp\napplication/pdf=pdf\napplication/x-fictionbook+xml=fb2\napplication/e-pub+zip=epub\napplication/x-ibooks+zip=ibooks\ntext/plain=txt\napplication/rtf=rtf\napplication/vnd.ms-htmlhelp=chm\napplication/zip=zip\napplication/x-7z-comressed=7z\napplication/x-bzip=bz\napplication/x-bzip2=bz2\napplication/x-tar=tar\napplication/x-rar-compressed=rar\nvideo/3gp=3gp\nvideo/3g2=3g2\nvideo/x-msvideo=avi\nvideo/x-flv=flv\nvideo/mpeg=mpeg\nvideo/mp4=mp4\nvideo/ogv=ogv\nvideo/quicktime=qt\nvideo/x-m4v=m4v\naudio/x-aif=aif\naudio/midi=midi\naudio/mpga=mpga\naudio/mp4=mp4a\naudio/ogg=oga\naudio/x-wav=wav\nimage/webp=webp\nimage/bmp=bmp\nimage/x-icon=ico\nimage/x-icon=ico\nimage/png=png\nimage/svg+xml=svg\nimage/tiff=tiff\nimage/jpeg=jpg\n");
+ defaultMap.put(FessConfig.INDEX_FILETYPE,
+ "text/html=html\napplication/msword=word\napplication/vnd.openxmlformats-officedocument.wordprocessingml.document=word\napplication/vnd.ms-excel=excel\napplication/vnd.ms-excel.sheet.2=excel\napplication/vnd.ms-excel.sheet.3=excel\napplication/vnd.ms-excel.sheet.4=excel\napplication/vnd.ms-excel.workspace.3=excel\napplication/vnd.ms-excel.workspace.4=excel\napplication/vnd.openxmlformats-officedocument.spreadsheetml.sheet=excel\napplication/vnd.ms-powerpoint=powerpoint\napplication/vnd.openxmlformats-officedocument.presentationml.presentation=powerpoint\napplication/vnd.oasis.opendocument.text=odt\napplication/vnd.oasis.opendocument.spreadsheet=ods\napplication/vnd.oasis.opendocument.presentation=odp\napplication/pdf=pdf\napplication/x-fictionbook+xml=fb2\napplication/e-pub+zip=epub\napplication/x-ibooks+zip=ibooks\ntext/plain=txt\napplication/rtf=rtf\napplication/vnd.ms-htmlhelp=chm\napplication/zip=zip\napplication/x-7z-comressed=7z\napplication/x-bzip=bz\napplication/x-bzip2=bz2\napplication/x-tar=tar\napplication/x-rar-compressed=rar\nvideo/3gp=3gp\nvideo/3g2=3g2\nvideo/x-msvideo=avi\nvideo/x-flv=flv\nvideo/mpeg=mpeg\nvideo/mp4=mp4\nvideo/ogv=ogv\nvideo/quicktime=qt\nvideo/x-m4v=m4v\naudio/x-aif=aif\naudio/midi=midi\naudio/mpga=mpga\naudio/mp4=mp4a\naudio/ogg=oga\naudio/x-wav=wav\nimage/webp=webp\nimage/bmp=bmp\nimage/x-icon=ico\nimage/x-icon=ico\nimage/png=png\nimage/svg+xml=svg\nimage/tiff=tiff\nimage/jpeg=jpg\n");
defaultMap.put(FessConfig.QUERY_MAX_LENGTH, "1000");
defaultMap.put(FessConfig.QUERY_TIMEOUT, "10000");
defaultMap.put(FessConfig.QUERY_TIMEOUT_LOGGING, "true");
@@ -9387,9 +9380,8 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
defaultMap.put(FessConfig.QUERY_GEO_FIELDS, "location");
defaultMap.put(FessConfig.QUERY_BROWSER_LANG_PARAMETER_NAME, "browser_lang");
defaultMap.put(FessConfig.QUERY_REPLACE_TERM_WITH_PREFIX_QUERY, "true");
- defaultMap
- .put(FessConfig.QUERY_HIGHLIGHT_TERMINAL_CHARS,
- "u0021u002Cu002Eu003Fu0589u061Fu06D4u0700u0701u0702u0964u104Au104Bu1362u1367u1368u166Eu1803u1809u203Cu203Du2047u2048u2049u3002uFE52uFE57uFF01uFF0EuFF1FuFF61");
+ defaultMap.put(FessConfig.QUERY_HIGHLIGHT_TERMINAL_CHARS,
+ "u0021u002Cu002Eu003Fu0589u061Fu06D4u0700u0701u0702u0964u104Au104Bu1362u1367u1368u166Eu1803u1809u203Cu203Du2047u2048u2049u3002uFE52uFE57uFF01uFF0EuFF1FuFF61");
defaultMap.put(FessConfig.QUERY_HIGHLIGHT_FRAGMENT_SIZE, "60");
defaultMap.put(FessConfig.QUERY_HIGHLIGHT_NUMBER_OF_FRAGMENTS, "2");
defaultMap.put(FessConfig.QUERY_HIGHLIGHT_TYPE, "fvh");
@@ -9432,9 +9424,8 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
defaultMap.put(FessConfig.QUERY_DEFAULT_LANGUAGES, "");
defaultMap.put(FessConfig.QUERY_JSON_DEFAULT_PREFERENCE, "_query");
defaultMap.put(FessConfig.QUERY_GSA_DEFAULT_PREFERENCE, "_query");
- defaultMap
- .put(FessConfig.QUERY_LANGUAGE_MAPPING,
- "ar=ar\nbg=bg\nbn=bn\nca=ca\nckb-iq=ckb-iq\nckb_IQ=ckb-iq\ncs=cs\nda=da\nde=de\nel=el\nen=en\nen-ie=en-ie\nen_IE=en-ie\nes=es\net=et\neu=eu\nfa=fa\nfi=fi\nfr=fr\ngl=gl\ngu=gu\nhe=he\nhi=hi\nhr=hr\nhu=hu\nhy=hy\nid=id\nit=it\nja=ja\nko=ko\nlt=lt\nlv=lv\nmk=mk\nml=ml\nnl=nl\nno=no\npa=pa\npl=pl\npt=pt\npt-br=pt-br\npt_BR=pt-br\nro=ro\nru=ru\nsi=si\nsq=sq\nsv=sv\nta=ta\nte=te\nth=th\ntl=tl\ntr=tr\nuk=uk\nur=ur\nvi=vi\nzh-cn=zh-cn\nzh_CN=zh-cn\nzh-tw=zh-tw\nzh_TW=zh-tw\nzh=zh\n");
+ defaultMap.put(FessConfig.QUERY_LANGUAGE_MAPPING,
+ "ar=ar\nbg=bg\nbn=bn\nca=ca\nckb-iq=ckb-iq\nckb_IQ=ckb-iq\ncs=cs\nda=da\nde=de\nel=el\nen=en\nen-ie=en-ie\nen_IE=en-ie\nes=es\net=et\neu=eu\nfa=fa\nfi=fi\nfr=fr\ngl=gl\ngu=gu\nhe=he\nhi=hi\nhr=hr\nhu=hu\nhy=hy\nid=id\nit=it\nja=ja\nko=ko\nlt=lt\nlv=lv\nmk=mk\nml=ml\nnl=nl\nno=no\npa=pa\npl=pl\npt=pt\npt-br=pt-br\npt_BR=pt-br\nro=ro\nru=ru\nsi=si\nsq=sq\nsv=sv\nta=ta\nte=te\nth=th\ntl=tl\ntr=tr\nuk=uk\nur=ur\nvi=vi\nzh-cn=zh-cn\nzh_CN=zh-cn\nzh-tw=zh-tw\nzh_TW=zh-tw\nzh=zh\n");
defaultMap.put(FessConfig.QUERY_BOOST_TITLE, "0.01");
defaultMap.put(FessConfig.QUERY_BOOST_TITLE_LANG, "1.0");
defaultMap.put(FessConfig.QUERY_BOOST_CONTENT, "0.005");
@@ -9444,9 +9435,8 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
defaultMap.put(FessConfig.QUERY_FACET_FIELDS_min_doc_count, "1");
defaultMap.put(FessConfig.QUERY_FACET_FIELDS_SORT, "count.desc");
defaultMap.put(FessConfig.QUERY_FACET_FIELDS_MISSING, "");
- defaultMap
- .put(FessConfig.QUERY_FACET_QUERIES,
- "labels.facet_timestamp_title:labels.facet_timestamp_1day=timestamp:[now/d-1d TO *]\tlabels.facet_timestamp_1week=timestamp:[now/d-7d TO *]\tlabels.facet_timestamp_1month=timestamp:[now/d-1M TO *]\tlabels.facet_timestamp_1year=timestamp:[now/d-1y TO *]\nlabels.facet_contentLength_title:labels.facet_contentLength_10k=content_length:[0 TO 9999]\tlabels.facet_contentLength_10kto100k=content_length:[10000 TO 99999]\tlabels.facet_contentLength_100kto500k=content_length:[100000 TO 499999]\tlabels.facet_contentLength_500kto1m=content_length:[500000 TO 999999]\tlabels.facet_contentLength_1m=content_length:[1000000 TO *]\nlabels.facet_filetype_title:labels.facet_filetype_html=filetype:html\tlabels.facet_filetype_word=filetype:word\tlabels.facet_filetype_excel=filetype:excel\tlabels.facet_filetype_powerpoint=filetype:powerpoint\tlabels.facet_filetype_odt=filetype:odt\tlabels.facet_filetype_ods=filetype:ods\tlabels.facet_filetype_odp=filetype:odp\tlabels.facet_filetype_pdf=filetype:pdf\tlabels.facet_filetype_txt=filetype:txt\tlabels.facet_filetype_others=filetype:others\n");
+ defaultMap.put(FessConfig.QUERY_FACET_QUERIES,
+ "labels.facet_timestamp_title:labels.facet_timestamp_1day=timestamp:[now/d-1d TO *]\tlabels.facet_timestamp_1week=timestamp:[now/d-7d TO *]\tlabels.facet_timestamp_1month=timestamp:[now/d-1M TO *]\tlabels.facet_timestamp_1year=timestamp:[now/d-1y TO *]\nlabels.facet_contentLength_title:labels.facet_contentLength_10k=content_length:[0 TO 9999]\tlabels.facet_contentLength_10kto100k=content_length:[10000 TO 99999]\tlabels.facet_contentLength_100kto500k=content_length:[100000 TO 499999]\tlabels.facet_contentLength_500kto1m=content_length:[500000 TO 999999]\tlabels.facet_contentLength_1m=content_length:[1000000 TO *]\nlabels.facet_filetype_title:labels.facet_filetype_html=filetype:html\tlabels.facet_filetype_word=filetype:word\tlabels.facet_filetype_excel=filetype:excel\tlabels.facet_filetype_powerpoint=filetype:powerpoint\tlabels.facet_filetype_odt=filetype:odt\tlabels.facet_filetype_ods=filetype:ods\tlabels.facet_filetype_odp=filetype:odp\tlabels.facet_filetype_pdf=filetype:pdf\tlabels.facet_filetype_txt=filetype:txt\tlabels.facet_filetype_others=filetype:others\n");
defaultMap.put(FessConfig.SMB_ROLE_FROM_FILE, "true");
defaultMap.put(FessConfig.SMB_AVAILABLE_SID_TYPES, "1,2,4:2");
defaultMap.put(FessConfig.FILE_ROLE_FROM_FILE, "true");
@@ -9455,9 +9445,8 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
".fess_basic_config.bulk,.fess_config.bulk,.fess_user.bulk,system.properties,fess.json,doc.json");
defaultMap.put(FessConfig.INDEX_BACKUP_LOG_TARGETS, "click_log.ndjson,favorite_log.ndjson,search_log.ndjson,user_info.ndjson");
defaultMap.put(FessConfig.LOGGING_SEARCH_DOCS_ENABLED, "true");
- defaultMap
- .put(FessConfig.LOGGING_SEARCH_DOCS_FIELDS,
- "filetype,created,click_count,title,doc_id,url,score,site,filename,host,digest,boost,mimetype,favorite_count,_id,lang,last_modified,content_length,timestamp");
+ defaultMap.put(FessConfig.LOGGING_SEARCH_DOCS_FIELDS,
+ "filetype,created,click_count,title,doc_id,url,score,site,filename,host,digest,boost,mimetype,favorite_count,_id,lang,last_modified,content_length,timestamp");
defaultMap.put(FessConfig.LOGGING_APP_PACKAGES, "org.codelibs,org.dbflute,org.lastaflute");
defaultMap.put(FessConfig.FORM_ADMIN_MAX_INPUT_SIZE, "4000");
defaultMap.put(FessConfig.FORM_ADMIN_LABEL_IN_CONFIG_ENABLED, "false");
diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
index 12686ff25..260d33898 100644
--- a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
+++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
@@ -237,21 +237,19 @@ public interface FessProp {
}
propMap.put(DEFAULT_SORT_VALUES, list);
}
- return list
- .stream()
- .map(p -> {
- final String key = p.getFirst();
- if (StringUtil.isEmpty(key)) {
- return p.getSecond();
- }
- if (userBean.map(
- user -> stream(user.getRoles()).get(stream -> stream.anyMatch(s -> key.equals(ROLE_VALUE_PREFIX + s)))
- || stream(user.getGroups()).get(stream -> stream.anyMatch(s -> key.equals(GROUP_VALUE_PREFIX + s))))
- .orElse(false)) {
- return p.getSecond();
- }
- return null;
- }).filter(StringUtil::isNotBlank).toArray(n -> new String[n]);
+ return list.stream().map(p -> {
+ final String key = p.getFirst();
+ if (StringUtil.isEmpty(key)) {
+ return p.getSecond();
+ }
+ if (userBean
+ .map(user -> stream(user.getRoles()).get(stream -> stream.anyMatch(s -> key.equals(ROLE_VALUE_PREFIX + s)))
+ || stream(user.getGroups()).get(stream -> stream.anyMatch(s -> key.equals(GROUP_VALUE_PREFIX + s))))
+ .orElse(false)) {
+ return p.getSecond();
+ }
+ return null;
+ }).filter(StringUtil::isNotBlank).toArray(n -> new String[n]);
}
default void setDefaultSortValue(final String value) {
@@ -272,42 +270,32 @@ public interface FessProp {
map = Collections.emptyMap();
} else {
final Set<String> keySet = new HashSet<>();
- map =
- split(value, "\n").get(
- stream -> stream
- .filter(StringUtil::isNotBlank)
- .map(s -> {
- final String[] pair = s.split("=");
- if (pair.length == 1) {
- return new Pair<>(StringUtil.EMPTY, pair[0].trim());
- } else if (pair.length == 2) {
- return new Pair<>(pair[0].trim(), pair[1].trim());
- }
- return null;
- })
- .filter(o -> o != null && keySet.add(o.getFirst()))
- .collect(HashMap<String, List<String>>::new,
- (m, d) -> m.put(d.getFirst(), Arrays.asList(d.getSecond().split(","))), HashMap::putAll));
+ map = split(value, "\n").get(stream -> stream.filter(StringUtil::isNotBlank).map(s -> {
+ final String[] pair = s.split("=");
+ if (pair.length == 1) {
+ return new Pair<>(StringUtil.EMPTY, pair[0].trim());
+ } else if (pair.length == 2) {
+ return new Pair<>(pair[0].trim(), pair[1].trim());
+ }
+ return null;
+ }).filter(o -> o != null && keySet.add(o.getFirst())).collect(HashMap<String, List<String>>::new,
+ (m, d) -> m.put(d.getFirst(), Arrays.asList(d.getSecond().split(","))), HashMap::putAll));
}
propMap.put(DEFAULT_LABEL_VALUES, map);
}
- return map
- .entrySet()
- .stream()
- .flatMap(
- e -> {
- final String key = e.getKey();
- if (StringUtil.isEmpty(key)) {
- return e.getValue().stream();
- }
- if (userBean.map(
- user -> stream(user.getRoles()).get(stream -> stream.anyMatch(s -> key.equals(ROLE_VALUE_PREFIX + s)))
- || stream(user.getGroups()).get(
- stream -> stream.anyMatch(s -> key.equals(GROUP_VALUE_PREFIX + s)))).orElse(false)) {
- return e.getValue().stream();
- }
- return Stream.empty();
- }).filter(StringUtil::isNotBlank).toArray(n -> new String[n]);
+ return map.entrySet().stream().flatMap(e -> {
+ final String key = e.getKey();
+ if (StringUtil.isEmpty(key)) {
+ return e.getValue().stream();
+ }
+ if (userBean
+ .map(user -> stream(user.getRoles()).get(stream -> stream.anyMatch(s -> key.equals(ROLE_VALUE_PREFIX + s)))
+ || stream(user.getGroups()).get(stream -> stream.anyMatch(s -> key.equals(GROUP_VALUE_PREFIX + s))))
+ .orElse(false)) {
+ return e.getValue().stream();
+ }
+ return Stream.empty();
+ }).filter(StringUtil::isNotBlank).toArray(n -> new String[n]);
}
default void setAppValue(final String value) {
@@ -841,8 +829,8 @@ public interface FessProp {
String getIndexBackupLogTargets();
default String[] getIndexBackupAllTargets() {
- return split(getIndexBackupTargets() + "," + getIndexBackupLogTargets(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).toArray(n -> new String[n]));
+ return split(getIndexBackupTargets() + "," + getIndexBackupLogTargets(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).toArray(n -> new String[n]));
}
String getJobSystemJobIds();
@@ -904,22 +892,22 @@ public interface FessProp {
String getSupportedUploadedJsExtentions();
default String[] getSupportedUploadedJsExtentionsAsArray() {
- return split(getSupportedUploadedJsExtentions(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).toArray(n -> new String[n]));
+ return split(getSupportedUploadedJsExtentions(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).toArray(n -> new String[n]));
}
String getSupportedUploadedCssExtentions();
default String[] getSupportedUploadedCssExtentionsAsArray() {
- return split(getSupportedUploadedCssExtentions(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).toArray(n -> new String[n]));
+ return split(getSupportedUploadedCssExtentions(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).toArray(n -> new String[n]));
}
String getSupportedUploadedMediaExtentions();
default String[] getSupportedUploadedMediaExtentionsAsArray() {
- return split(getSupportedUploadedMediaExtentions(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).toArray(n -> new String[n]));
+ return split(getSupportedUploadedMediaExtentions(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).toArray(n -> new String[n]));
}
String getJobTemplateTitleWeb();
@@ -962,9 +950,8 @@ public interface FessProp {
default boolean isCrawlerMetadataContentIncluded(final String name) {
Pattern[] patterns = (Pattern[]) propMap.get(CRAWLER_METADATA_CONTENT_EXCLUDES);
if (patterns == null) {
- patterns =
- split(getCrawlerMetadataContentExcludes(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).map(v -> Pattern.compile(v)).toArray(n -> new Pattern[n]));
+ patterns = split(getCrawlerMetadataContentExcludes(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(v -> Pattern.compile(v)).toArray(n -> new Pattern[n]));
propMap.put(CRAWLER_METADATA_CONTENT_EXCLUDES, patterns);
}
return !stream(patterns).get(stream -> stream.anyMatch(p -> p.matcher(name).matches()));
@@ -1091,8 +1078,8 @@ public interface FessProp {
String getSupportedUploadedFiles();
default boolean isSupportedUploadedFile(final String name) {
- return split(getSuggestPopularWordExcludes(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).anyMatch(s -> s.equals(name)));
+ return split(getSuggestPopularWordExcludes(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).anyMatch(s -> s.equals(name)));
}
String getLdapAdminUserObjectClasses();
@@ -1188,8 +1175,8 @@ public interface FessProp {
String getCrawlerWebProtocols();
default String[] getCrawlerWebProtocolsAsArray() {
- return split(getCrawlerWebProtocols(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).map(s -> s.trim() + ":").toArray(n -> new String[n]));
+ return split(getCrawlerWebProtocols(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(s -> s.trim() + ":").toArray(n -> new String[n]));
}
default boolean isValidCrawlerWebProtocol(final String url) {
@@ -1199,8 +1186,8 @@ public interface FessProp {
String getCrawlerFileProtocols();
default String[] getCrawlerFileProtocolsAsArray() {
- return split(getCrawlerFileProtocols(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).map(s -> s.trim() + ":").toArray(n -> new String[n]));
+ return split(getCrawlerFileProtocols(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(s -> s.trim() + ":").toArray(n -> new String[n]));
}
default boolean isValidCrawlerFileProtocol(final String url) {
@@ -1211,30 +1198,28 @@ public interface FessProp {
default String[] getSearchDefaultPermissionsAsArray() {
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- return split(getRoleSearchDefaultPermissions(), ",")
- .get(stream -> stream.map(p -> permissionHelper.encode(p)).filter(StringUtil::isNotBlank).distinct()
- .toArray(n -> new String[n]));
+ return split(getRoleSearchDefaultPermissions(), ",").get(stream -> stream.map(p -> permissionHelper.encode(p))
+ .filter(StringUtil::isNotBlank).distinct().toArray(n -> new String[n]));
}
String getRoleSearchDefaultDisplayPermissions();
default String[] getSearchDefaultDisplayEncodedPermissions() {
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- return split(getRoleSearchDefaultDisplayPermissions(), ",")
- .get(stream -> stream.map(p -> permissionHelper.encode(p)).filter(StringUtil::isNotBlank).distinct()
- .toArray(n -> new String[n]));
+ return split(getRoleSearchDefaultDisplayPermissions(), ",").get(stream -> stream.map(p -> permissionHelper.encode(p))
+ .filter(StringUtil::isNotBlank).distinct().toArray(n -> new String[n]));
}
default String getSearchDefaultDisplayPermission() {
- return split(getRoleSearchDefaultDisplayPermissions(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
+ return split(getRoleSearchDefaultDisplayPermissions(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
}
String getQueryGeoFields();
default String[] getQueryGeoFieldsAsArray() {
- return split(getQueryGeoFields(), ",").get(
- stream -> stream.map(String::trim).filter(StringUtil::isNotBlank).toArray(n -> new String[n]));
+ return split(getQueryGeoFields(), ",")
+ .get(stream -> stream.map(String::trim).filter(StringUtil::isNotBlank).toArray(n -> new String[n]));
}
String getSuggestSearchLogPermissions();
@@ -1247,10 +1232,8 @@ public interface FessProp {
List<String> validPermissionList = (List<String>) propMap.get(SUGGEST_SEARCH_LOG_PERMISSIONS);
if (validPermissionList == null) {
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- validPermissionList =
- split(getSuggestSearchLogPermissions(), ",").get(
- stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank)
- .collect(Collectors.toList()));
+ validPermissionList = split(getSuggestSearchLogPermissions(), ",")
+ .get(stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).collect(Collectors.toList()));
propMap.put(SUGGEST_SEARCH_LOG_PERMISSIONS, validPermissionList);
}
final List<String> list = validPermissionList;
@@ -1266,10 +1249,8 @@ public interface FessProp {
List<String> list = (List<String>) propMap.get(SEARCH_GUEST_PERMISSION_LIST);
if (list == null) {
final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
- list =
- split(getRoleSearchGuestPermissions(), ",").get(
- stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank)
- .collect(Collectors.toList()));
+ list = split(getRoleSearchGuestPermissions(), ",")
+ .get(stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).collect(Collectors.toList()));
list.add(getRoleSearchUserPrefix() + Constants.GUEST_USER);
propMap.put(SEARCH_GUEST_PERMISSION_LIST, list);
}
@@ -1282,9 +1263,8 @@ public interface FessProp {
@SuppressWarnings("unchecked")
Set<String> fieldSet = (Set<String>) propMap.get(INDEX_ADMIN_ARRAY_FIELD_SET);
if (fieldSet == null) {
- fieldSet =
- split(getIndexAdminArrayFields(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).collect(Collectors.toSet()));
+ fieldSet = split(getIndexAdminArrayFields(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).collect(Collectors.toSet()));
propMap.put(INDEX_ADMIN_ARRAY_FIELD_SET, fieldSet);
}
return fieldSet;
@@ -1296,10 +1276,9 @@ public interface FessProp {
default List<String> invalidIndexArrayFields(final Map<String, Object> source) {
// TODO always returns empty list
- return split(getIndexAdminArrayFields(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).filter(s -> isNonEmptyValue(source.get(s)))
- .filter(s -> false) // TODO
- .collect(Collectors.toList()));
+ return split(getIndexAdminArrayFields(), ",").get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim)
+ .filter(s -> isNonEmptyValue(source.get(s))).filter(s -> false) // TODO
+ .collect(Collectors.toList()));
}
String getIndexAdminDateFields();
@@ -1308,9 +1287,8 @@ public interface FessProp {
@SuppressWarnings("unchecked")
Set<String> fieldSet = (Set<String>) propMap.get(INDEX_ADMIN_DATE_FIELD_SET);
if (fieldSet == null) {
- fieldSet =
- split(getIndexAdminDateFields(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).collect(Collectors.toSet()));
+ fieldSet = split(getIndexAdminDateFields(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).collect(Collectors.toSet()));
propMap.put(INDEX_ADMIN_DATE_FIELD_SET, fieldSet);
}
return fieldSet;
@@ -1321,8 +1299,8 @@ public interface FessProp {
}
default List<String> invalidIndexDateFields(final Map<String, Object> source) {
- return split(getIndexAdminDateFields(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).filter(s -> isNonEmptyValue(source.get(s)))
+ return split(getIndexAdminDateFields(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).filter(s -> isNonEmptyValue(source.get(s)))
.filter(s -> !validateDateTimeString(source.get(s))).collect(Collectors.toList()));
}
@@ -1339,9 +1317,8 @@ public interface FessProp {
@SuppressWarnings("unchecked")
Set<String> fieldSet = (Set<String>) propMap.get(INDEX_ADMIN_INTEGER_FIELD_SET);
if (fieldSet == null) {
- fieldSet =
- split(getIndexAdminIntegerFields(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).collect(Collectors.toSet()));
+ fieldSet = split(getIndexAdminIntegerFields(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).collect(Collectors.toSet()));
propMap.put(INDEX_ADMIN_INTEGER_FIELD_SET, fieldSet);
}
return fieldSet;
@@ -1353,8 +1330,8 @@ public interface FessProp {
default List<String> invalidIndexIntegerFields(final Map<String, Object> source) {
final IntegerTypeValidator integerValidator = new IntegerTypeValidator();
- return split(getIndexAdminIntegerFields(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).filter(s -> isNonEmptyValue(source.get(s)))
+ return split(getIndexAdminIntegerFields(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).filter(s -> isNonEmptyValue(source.get(s)))
.filter(s -> !integerValidator.isValid(source.get(s).toString(), null)).collect(Collectors.toList()));
}
@@ -1364,9 +1341,8 @@ public interface FessProp {
@SuppressWarnings("unchecked")
Set<String> fieldSet = (Set<String>) propMap.get(INDEX_ADMIN_LONG_FIELD_SET);
if (fieldSet == null) {
- fieldSet =
- split(getIndexAdminLongFields(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).collect(Collectors.toSet()));
+ fieldSet = split(getIndexAdminLongFields(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).collect(Collectors.toSet()));
propMap.put(INDEX_ADMIN_LONG_FIELD_SET, fieldSet);
}
return fieldSet;
@@ -1378,8 +1354,8 @@ public interface FessProp {
default List<String> invalidIndexLongFields(final Map<String, Object> source) {
final LongTypeValidator longValidator = new LongTypeValidator();
- return split(getIndexAdminLongFields(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).filter(s -> isNonEmptyValue(source.get(s)))
+ return split(getIndexAdminLongFields(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).filter(s -> isNonEmptyValue(source.get(s)))
.filter(s -> !longValidator.isValid(source.get(s).toString(), null)).collect(Collectors.toList()));
}
@@ -1389,9 +1365,8 @@ public interface FessProp {
@SuppressWarnings("unchecked")
Set<String> fieldSet = (Set<String>) propMap.get(INDEX_ADMIN_FLOAT_FIELD_SET);
if (fieldSet == null) {
- fieldSet =
- split(getIndexAdminFloatFields(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).collect(Collectors.toSet()));
+ fieldSet = split(getIndexAdminFloatFields(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).collect(Collectors.toSet()));
propMap.put(INDEX_ADMIN_FLOAT_FIELD_SET, fieldSet);
}
return fieldSet;
@@ -1403,8 +1378,8 @@ public interface FessProp {
default List<String> invalidIndexFloatFields(final Map<String, Object> source) {
final FloatTypeValidator floatValidator = new FloatTypeValidator();
- return split(getIndexAdminFloatFields(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).filter(s -> isNonEmptyValue(source.get(s)))
+ return split(getIndexAdminFloatFields(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).filter(s -> isNonEmptyValue(source.get(s)))
.filter(s -> !floatValidator.isValid(source.get(s).toString(), null)).collect(Collectors.toList()));
}
@@ -1414,9 +1389,8 @@ public interface FessProp {
@SuppressWarnings("unchecked")
Set<String> fieldSet = (Set<String>) propMap.get(INDEX_ADMIN_DOUBLE_FIELD_SET);
if (fieldSet == null) {
- fieldSet =
- split(getIndexAdminDoubleFields(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).collect(Collectors.toSet()));
+ fieldSet = split(getIndexAdminDoubleFields(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).collect(Collectors.toSet()));
propMap.put(INDEX_ADMIN_DOUBLE_FIELD_SET, fieldSet);
}
return fieldSet;
@@ -1428,8 +1402,8 @@ public interface FessProp {
default List<String> invalidIndexDoubleFields(final Map<String, Object> source) {
final DoubleTypeValidator doubleValidator = new DoubleTypeValidator();
- return split(getIndexAdminDoubleFields(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).filter(s -> isNonEmptyValue(source.get(s)))
+ return split(getIndexAdminDoubleFields(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).filter(s -> isNonEmptyValue(source.get(s)))
.filter(s -> !doubleValidator.isValid(source.get(s).toString(), null)).collect(Collectors.toList()));
}
@@ -1442,34 +1416,31 @@ public interface FessProp {
final Set<String> floatFieldSet = getIndexAdminFloatFieldSet();
final Set<String> doubleFieldSet = getIndexAdminDoubleFieldSet();
- return source
- .entrySet()
- .stream()
- .map(e -> {
- final String key = e.getKey();
- Object value = e.getValue();
- if (value == null) {
- value = StringUtil.EMPTY;
- }
- if (value instanceof String || value == null) {
- return new Pair<>(key, value);
- }
- if (arrayFieldSet.contains(key)) {
- if (value instanceof String[]) {
- value = stream((String[]) value).get(stream -> stream.collect(Collectors.joining("\n")));
- } else if (value instanceof List) {
- @SuppressWarnings("unchecked")
- final List<String> list = (List<String>) value;
- value = list.stream().collect(Collectors.joining("\n"));
- }
- } else if (dateFieldSet.contains(key)) {
- value = FessFunctions.formatDate((Date) value);
- } else if (integerFieldSet.contains(key) || longFieldSet.contains(key) || floatFieldSet.contains(key)
- || doubleFieldSet.contains(key)) {
- value = value.toString();
- }
- return new Pair<>(key, value);
- }).collect(Collectors.toMap(Pair::getFirst, Pair::getSecond));
+ return source.entrySet().stream().map(e -> {
+ final String key = e.getKey();
+ Object value = e.getValue();
+ if (value == null) {
+ value = StringUtil.EMPTY;
+ }
+ if (value instanceof String || value == null) {
+ return new Pair<>(key, value);
+ }
+ if (arrayFieldSet.contains(key)) {
+ if (value instanceof String[]) {
+ value = stream((String[]) value).get(stream -> stream.collect(Collectors.joining("\n")));
+ } else if (value instanceof List) {
+ @SuppressWarnings("unchecked")
+ final List<String> list = (List<String>) value;
+ value = list.stream().collect(Collectors.joining("\n"));
+ }
+ } else if (dateFieldSet.contains(key)) {
+ value = FessFunctions.formatDate((Date) value);
+ } else if (integerFieldSet.contains(key) || longFieldSet.contains(key) || floatFieldSet.contains(key)
+ || doubleFieldSet.contains(key)) {
+ value = value.toString();
+ }
+ return new Pair<>(key, value);
+ }).collect(Collectors.toMap(Pair::getFirst, Pair::getSecond));
}
default Map<String, Object> convertToStorableDoc(final Map<String, Object> source) {
@@ -1481,31 +1452,26 @@ public interface FessProp {
final Set<String> floatFieldSet = getIndexAdminFloatFieldSet();
final Set<String> doubleFieldSet = getIndexAdminDoubleFieldSet();
- return source
- .entrySet()
- .stream()
- .filter(e -> isNonEmptyValue(e.getValue()))
- .map(e -> {
- final String key = e.getKey();
- Object value = e.getValue();
- if (arrayFieldSet.contains(key)) {
- value =
- split(value.toString(), "\n").get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).collect(Collectors.toList()));
- } else if (dateFieldSet.contains(key)) {
- // TODO time zone
- value = FessFunctions.parseDate(value.toString());
- } else if (integerFieldSet.contains(key)) {
- value = DfTypeUtil.toInteger(value.toString());
- } else if (longFieldSet.contains(key)) {
- value = DfTypeUtil.toLong(value.toString());
- } else if (floatFieldSet.contains(key)) {
- value = DfTypeUtil.toFloat(value.toString());
- } else if (doubleFieldSet.contains(key)) {
- value = DfTypeUtil.toDouble(value.toString());
- }
- return new Pair<>(key, value);
- }).collect(Collectors.toMap(Pair::getFirst, Pair::getSecond));
+ return source.entrySet().stream().filter(e -> isNonEmptyValue(e.getValue())).map(e -> {
+ final String key = e.getKey();
+ Object value = e.getValue();
+ if (arrayFieldSet.contains(key)) {
+ value = split(value.toString(), "\n")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).collect(Collectors.toList()));
+ } else if (dateFieldSet.contains(key)) {
+ // TODO time zone
+ value = FessFunctions.parseDate(value.toString());
+ } else if (integerFieldSet.contains(key)) {
+ value = DfTypeUtil.toInteger(value.toString());
+ } else if (longFieldSet.contains(key)) {
+ value = DfTypeUtil.toLong(value.toString());
+ } else if (floatFieldSet.contains(key)) {
+ value = DfTypeUtil.toFloat(value.toString());
+ } else if (doubleFieldSet.contains(key)) {
+ value = DfTypeUtil.toDouble(value.toString());
+ }
+ return new Pair<>(key, value);
+ }).collect(Collectors.toMap(Pair::getFirst, Pair::getSecond));
}
String getIndexAdminRequiredFields();
@@ -1516,9 +1482,8 @@ public interface FessProp {
default List<String> invalidIndexRequiredFields(final Map<String, Object> source) {
final RequiredValidator requiredValidator = new RequiredValidator();
- return split(getIndexAdminRequiredFields(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim)
- .filter(s -> !requiredValidator.isValid(source.get(s), null)).collect(Collectors.toList()));
+ return split(getIndexAdminRequiredFields(), ",").get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim)
+ .filter(s -> !requiredValidator.isValid(source.get(s), null)).collect(Collectors.toList()));
}
default boolean isNonEmptyValue(final Object value) {
@@ -1545,9 +1510,8 @@ public interface FessProp {
int[] spaceChars = (int[]) propMap.get(key);
if (spaceChars == null) {
if (spaceStr.startsWith("u")) {
- spaceChars =
- split(spaceStr, "u").get(
- stream -> stream.filter(StringUtil::isNotBlank).mapToInt(s -> Integer.parseInt(s, 16)).toArray());
+ spaceChars = split(spaceStr, "u")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).mapToInt(s -> Integer.parseInt(s, 16)).toArray());
} else {
// backward compatibility
final int length = spaceStr.length();
@@ -1584,8 +1548,8 @@ public interface FessProp {
default String[] getQueryAdditionalResponseFields(final String... fields) {
final List<String> list = new ArrayList<>(fields.length + 10);
stream(fields).of(stream -> stream.forEach(list::add));
- split(getQueryAdditionalResponseFields(), ",").of(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).forEach(list::add));
+ split(getQueryAdditionalResponseFields(), ",")
+ .of(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).forEach(list::add));
return list.toArray(new String[list.size()]);
}
@@ -1594,8 +1558,8 @@ public interface FessProp {
default String[] getQueryAdditionalScrollResponseFields(final String... fields) {
final List<String> list = new ArrayList<>(fields.length + 10);
stream(fields).of(stream -> stream.forEach(list::add));
- split(getQueryAdditionalScrollResponseFields(), ",").of(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).forEach(list::add));
+ split(getQueryAdditionalScrollResponseFields(), ",")
+ .of(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).forEach(list::add));
return list.toArray(new String[list.size()]);
}
@@ -1604,8 +1568,8 @@ public interface FessProp {
default String[] getQueryAdditionalCacheResponseFields(final String... fields) {
final List<String> list = new ArrayList<>(fields.length + 10);
stream(fields).of(stream -> stream.forEach(list::add));
- split(getQueryAdditionalCacheResponseFields(), ",").of(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).forEach(list::add));
+ split(getQueryAdditionalCacheResponseFields(), ",")
+ .of(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).forEach(list::add));
return list.toArray(new String[list.size()]);
}
@@ -1614,8 +1578,8 @@ public interface FessProp {
default String[] getQueryAdditionalHighlightedFields(final String... fields) {
final List<String> list = new ArrayList<>(fields.length + 10);
stream(fields).of(stream -> stream.forEach(list::add));
- split(getQueryAdditionalHighlightedFields(), ",").of(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).forEach(list::add));
+ split(getQueryAdditionalHighlightedFields(), ",")
+ .of(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).forEach(list::add));
return list.toArray(new String[list.size()]);
}
@@ -1624,8 +1588,8 @@ public interface FessProp {
default String[] getQueryAdditionalSearchFields(final String... fields) {
final List<String> list = new ArrayList<>(fields.length + 10);
stream(fields).of(stream -> stream.forEach(list::add));
- split(getQueryAdditionalSearchFields(), ",").of(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).forEach(list::add));
+ split(getQueryAdditionalSearchFields(), ",")
+ .of(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).forEach(list::add));
return list.toArray(new String[list.size()]);
}
@@ -1653,8 +1617,8 @@ public interface FessProp {
default String[] getQueryAdditionalApiResponseFields(final String... fields) {
final List<String> list = new ArrayList<>(fields.length + 10);
stream(fields).of(stream -> stream.forEach(list::add));
- split(getQueryAdditionalApiResponseFields(), ",").of(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).forEach(list::add));
+ split(getQueryAdditionalApiResponseFields(), ",")
+ .of(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).forEach(list::add));
return list.toArray(new String[list.size()]);
}
@@ -1663,8 +1627,8 @@ public interface FessProp {
default String[] getQueryAdditionalNotAnalyzedFields(final String... fields) {
final List<String> list = new ArrayList<>(fields.length + 10);
stream(fields).of(stream -> stream.forEach(list::add));
- split(getQueryAdditionalNotAnalyzedFields(), ",").of(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).forEach(list::add));
+ split(getQueryAdditionalNotAnalyzedFields(), ",")
+ .of(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).forEach(list::add));
return list.toArray(new String[list.size()]);
}
@@ -1681,9 +1645,8 @@ public interface FessProp {
@SuppressWarnings("unchecked")
Set<String> fieldSet = (Set<String>) propMap.get(API_ADMIN_ACCESS_PERMISSION_SET);
if (fieldSet == null) {
- fieldSet =
- split(getApiAdminAccessPermissions(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).collect(Collectors.toSet()));
+ fieldSet = split(getApiAdminAccessPermissions(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).collect(Collectors.toSet()));
propMap.put(API_ADMIN_ACCESS_PERMISSION_SET, fieldSet);
}
return fieldSet;
@@ -1718,19 +1681,14 @@ public interface FessProp {
if (StringUtil.isBlank(sorts)) {
ot = OptionalThing.empty();
} else {
- final SortBuilder[] sortBuilders =
- split(sorts, ",").get(
- stream -> stream
- .filter(StringUtil::isNotBlank)
- .map(s -> {
- final String[] values = s.split(":");
- if (values.length > 1) {
- return SortBuilders.fieldSort(values[0]).order(
- values[0].equalsIgnoreCase("desc") ? SortOrder.DESC : SortOrder.ASC);
- } else {
- return SortBuilders.fieldSort(values[0]).order(SortOrder.ASC);
- }
- }).toArray(n -> new SortBuilder[n]));
+ final SortBuilder[] sortBuilders = split(sorts, ",").get(stream -> stream.filter(StringUtil::isNotBlank).map(s -> {
+ final String[] values = s.split(":");
+ if (values.length > 1) {
+ return SortBuilders.fieldSort(values[0]).order(values[0].equalsIgnoreCase("desc") ? SortOrder.DESC : SortOrder.ASC);
+ } else {
+ return SortBuilders.fieldSort(values[0]).order(SortOrder.ASC);
+ }
+ }).toArray(n -> new SortBuilder[n]));
ot = OptionalThing.of(sortBuilders);
}
propMap.put(QUERY_COLLAPSE_INNER_HITS_SORTS, ot);
@@ -1752,31 +1710,26 @@ public interface FessProp {
default Tuple3<String, String, String>[] getVirtualHosts() {
Tuple3<String, String, String>[] hosts = (Tuple3<String, String, String>[]) propMap.get(VIRTUAL_HOST_HEADERS);
if (hosts == null) {
- hosts =
- split(getVirtualHostHeaderValue(), "\n").get(
- stream -> stream
- .map(s -> {
- final String[] v1 = s.split("=");
- if (v1.length == 2) {
- final String[] v2 = v1[0].split(":", 2);
- if (v2.length == 2) {
- return new Tuple3<>(v2[0].trim(), v2[1].trim(), v1[1].replaceAll("[^a-zA-Z0-9_]",
- StringUtil.EMPTY).trim());
- }
- }
- return null;
- })
- .filter(v -> {
- if (v == null) {
- return false;
- }
- if ("admin".equalsIgnoreCase(v.getValue3()) || "common".equalsIgnoreCase(v.getValue3())
- || "error".equalsIgnoreCase(v.getValue3()) || "login".equalsIgnoreCase(v.getValue3())
- || "profile".equalsIgnoreCase(v.getValue3())) {
- return false;
- }
- return true;
- }).toArray(n -> new Tuple3[n]));
+ hosts = split(getVirtualHostHeaderValue(), "\n").get(stream -> stream.map(s -> {
+ final String[] v1 = s.split("=");
+ if (v1.length == 2) {
+ final String[] v2 = v1[0].split(":", 2);
+ if (v2.length == 2) {
+ return new Tuple3<>(v2[0].trim(), v2[1].trim(), v1[1].replaceAll("[^a-zA-Z0-9_]", StringUtil.EMPTY).trim());
+ }
+ }
+ return null;
+ }).filter(v -> {
+ if (v == null) {
+ return false;
+ }
+ if ("admin".equalsIgnoreCase(v.getValue3()) || "common".equalsIgnoreCase(v.getValue3())
+ || "error".equalsIgnoreCase(v.getValue3()) || "login".equalsIgnoreCase(v.getValue3())
+ || "profile".equalsIgnoreCase(v.getValue3())) {
+ return false;
+ }
+ return true;
+ }).toArray(n -> new Tuple3[n]));
propMap.put(VIRTUAL_HOST_HEADERS, hosts);
}
return hosts;
@@ -1787,9 +1740,8 @@ public interface FessProp {
default boolean isCrawlerFailureUrlStatusCodes(final int code) {
int[] codes = (int[]) propMap.get(CRAWLER_FAILURE_URL_STATUS_CODES);
if (codes == null) {
- codes =
- split(getCrawlerFailureUrlStatusCodes(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).mapToInt(Integer::parseInt).toArray());
+ codes = split(getCrawlerFailureUrlStatusCodes(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).mapToInt(Integer::parseInt).toArray());
propMap.put(CRAWLER_FAILURE_URL_STATUS_CODES, codes);
}
for (final int v : codes) {
@@ -1862,10 +1814,8 @@ public interface FessProp {
String[] excludeExtensions = (String[]) propMap.get(THUMBNAIL_HTML_IMAGE_EXCLUDE_EXTENSIONS);
if (excludeExtensions == null) {
- excludeExtensions =
- split(getThumbnailHtmlImageExcludeExtensions(), ",").get(
- stream -> stream.map(s -> s.toLowerCase(Locale.ROOT).trim()).filter(StringUtil::isNotBlank)
- .toArray(n -> new String[n]));
+ excludeExtensions = split(getThumbnailHtmlImageExcludeExtensions(), ",").get(stream -> stream
+ .map(s -> s.toLowerCase(Locale.ROOT).trim()).filter(StringUtil::isNotBlank).toArray(n -> new String[n]));
propMap.put(THUMBNAIL_HTML_IMAGE_EXCLUDE_EXTENSIONS, excludeExtensions);
}
@@ -1879,10 +1829,8 @@ public interface FessProp {
@SuppressWarnings("unchecked")
Set<String> gsaResponseFieldSet = (Set<String>) propMap.get(QUERY_GSA_RESPONSE_FIELDS);
if (gsaResponseFieldSet == null) {
- gsaResponseFieldSet =
- split(getQueryGsaResponseFields(), ",").get(
- stream -> stream.map(s -> s.toLowerCase(Locale.ROOT).trim()).filter(StringUtil::isNotBlank)
- .collect(Collectors.toSet()));
+ gsaResponseFieldSet = split(getQueryGsaResponseFields(), ",").get(stream -> stream.map(s -> s.toLowerCase(Locale.ROOT).trim())
+ .filter(StringUtil::isNotBlank).collect(Collectors.toSet()));
propMap.put(QUERY_GSA_RESPONSE_FIELDS, gsaResponseFieldSet);
}
return gsaResponseFieldSet.contains(name.toLowerCase(Locale.ROOT));
@@ -1897,10 +1845,8 @@ public interface FessProp {
if (StringUtil.isBlank(refs)) {
patterns = new Pattern[0];
} else {
- patterns =
- split(refs, "\n").get(
- stream -> stream.filter(StringUtil::isNotBlank).map(s -> Pattern.compile(s.trim()))
- .toArray(n -> new Pattern[n]));
+ patterns = split(refs, "\n").get(
+ stream -> stream.filter(StringUtil::isNotBlank).map(s -> Pattern.compile(s.trim())).toArray(n -> new Pattern[n]));
}
propMap.put(API_SEARCH_ACCEPT_REFERERS, patterns);
}
@@ -1917,8 +1863,8 @@ public interface FessProp {
String getQueryHighlightContentDescriptionFields();
default String[] getQueryHighlightContentDescriptionFieldsAsArray() {
- return split(getQueryHighlightContentDescriptionFields(), ",").get(
- stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).toArray(n -> new String[n]));
+ return split(getQueryHighlightContentDescriptionFields(), ",")
+ .get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).toArray(n -> new String[n]));
}
boolean isLdapIgnoreNetbiosName();
@@ -2026,9 +1972,8 @@ public interface FessProp {
@SuppressWarnings("unchecked")
List<String> list = (List<String>) propMap.get(CORS_ALLOW_ORIGIN);
if (list == null) {
- list =
- split(getApiCorsAllowOrigin(), "\n").get(
- stream -> stream.map(String::trim).filter(StringUtil::isNotEmpty).collect(Collectors.toList()));
+ list = split(getApiCorsAllowOrigin(), "\n")
+ .get(stream -> stream.map(String::trim).filter(StringUtil::isNotEmpty).collect(Collectors.toList()));
propMap.put(CORS_ALLOW_ORIGIN, list);
}
return list;
@@ -2044,8 +1989,8 @@ public interface FessProp {
String getSessionTrackingModes();
default Set<String> getSessionTrackingModesAsSet() {
- return split(getSessionTrackingModes(), ",").get(
- stream -> stream.map(s -> s.trim().toUpperCase(Locale.ENGLISH)).collect(Collectors.toSet()));
+ return split(getSessionTrackingModes(), ",")
+ .get(stream -> stream.map(s -> s.trim().toUpperCase(Locale.ENGLISH)).collect(Collectors.toSet()));
}
String getQueryTrackTotalHits();
diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessActionAdjustmentProvider.java b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessActionAdjustmentProvider.java
index 1f29cfeeb..10449f7eb 100644
--- a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessActionAdjustmentProvider.java
+++ b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessActionAdjustmentProvider.java
@@ -33,8 +33,8 @@ public class FessActionAdjustmentProvider implements ActionAdjustmentProvider {
@Override
public FormMappingOption adjustFormMapping() {
- return new FormMappingOption().filterSimpleTextParameter((parameter, meta) -> parameter.trim().replace("\r\n", "\n")
- .replace('\r', '\n'));
+ return new FormMappingOption()
+ .filterSimpleTextParameter((parameter, meta) -> parameter.trim().replace("\r\n", "\n").replace('\r', '\n'));
}
@Override
diff --git a/src/main/java/org/codelibs/fess/mylasta/mail/CrawlerPostcard.java b/src/main/java/org/codelibs/fess/mylasta/mail/CrawlerPostcard.java
index 875a1921b..2ef20e4be 100644
--- a/src/main/java/org/codelibs/fess/mylasta/mail/CrawlerPostcard.java
+++ b/src/main/java/org/codelibs/fess/mylasta/mail/CrawlerPostcard.java
@@ -50,9 +50,9 @@ public class CrawlerPostcard extends LaTypicalPostcard {
@Override
protected String[] getPropertyNames() {
- return new String[] { "hostname", "jobname", "webFsCrawlStartTime", "webFsCrawlEndTime", "webFsCrawlExecTime",
- "webFsIndexExecTime", "webFsIndexSize", "dataCrawlStartTime", "dataCrawlEndTime", "dataCrawlExecTime", "dataIndexExecTime",
- "dataIndexSize", "crawlerStartTime", "crawlerEndTime", "crawlerExecTime", "status" };
+ return new String[] { "hostname", "jobname", "webFsCrawlStartTime", "webFsCrawlEndTime", "webFsCrawlExecTime", "webFsIndexExecTime",
+ "webFsIndexSize", "dataCrawlStartTime", "dataCrawlEndTime", "dataCrawlExecTime", "dataIndexExecTime", "dataIndexSize",
+ "crawlerStartTime", "crawlerEndTime", "crawlerExecTime", "status" };
}
// ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java b/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java
index 6b08b72f3..1b75c1fae 100644
--- a/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java
+++ b/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java
@@ -33,7 +33,7 @@ public class LtrQueryRescorer implements QueryRescorer {
if (StringUtil.isBlank(modelName)) {
return null;
}
- return new QueryRescorerBuilder(new StoredLtrQueryBuilder().modelName(modelName).params(params)).windowSize(fessConfig
- .getLtrWindowSize());
+ return new QueryRescorerBuilder(new StoredLtrQueryBuilder().modelName(modelName).params(params))
+ .windowSize(fessConfig.getLtrWindowSize());
}
}
diff --git a/src/main/java/org/codelibs/fess/score/ScoreBooster.java b/src/main/java/org/codelibs/fess/score/ScoreBooster.java
index 66f15f550..cf1577f54 100644
--- a/src/main/java/org/codelibs/fess/score/ScoreBooster.java
+++ b/src/main/java/org/codelibs/fess/score/ScoreBooster.java
@@ -57,9 +57,8 @@ public abstract class ScoreBooster {
if (url == null) {
return StringUtil.EMPTY_STRINGS;
}
- final SearchResponse response =
- client.prepareSearch(index).setQuery(QueryBuilders.termQuery(fessConfig.getIndexFieldUrl(), url)).setFetchSource(false)
- .setSize(fessConfig.getPageScoreBoosterMaxFetchSizeAsInteger()).execute().actionGet(requestTimeout);
+ final SearchResponse response = client.prepareSearch(index).setQuery(QueryBuilders.termQuery(fessConfig.getIndexFieldUrl(), url))
+ .setFetchSource(false).setSize(fessConfig.getPageScoreBoosterMaxFetchSizeAsInteger()).execute().actionGet(requestTimeout);
return Arrays.stream(response.getHits().getHits()).map(SearchHit::getId).toArray(n -> new String[n]);
};
diff --git a/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java b/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java
index e239599fb..8bff5114a 100644
--- a/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java
+++ b/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java
@@ -149,11 +149,10 @@ public class AzureAdAuthenticator implements SsoAuthenticator {
final String state = UuidUtil.create();
final String nonce = UuidUtil.create();
storeStateInSession(request.getSession(), state, nonce);
- final String authUrl =
- getAuthority() + getTenant()
- + "/oauth2/authorize?response_type=code&scope=directory.read.all&response_mode=form_post&redirect_uri="
- + URLEncoder.encode(getReplyUrl(request), Constants.UTF_8_CHARSET) + "&client_id=" + getClientId()
- + "&resource=https%3a%2f%2fgraph.microsoft.com" + "&state=" + state + "&nonce=" + nonce;
+ final String authUrl = getAuthority() + getTenant()
+ + "/oauth2/authorize?response_type=code&scope=directory.read.all&response_mode=form_post&redirect_uri="
+ + URLEncoder.encode(getReplyUrl(request), Constants.UTF_8_CHARSET) + "&client_id=" + getClientId()
+ + "&resource=https%3a%2f%2fgraph.microsoft.com" + "&state=" + state + "&nonce=" + nonce;
if (logger.isDebugEnabled()) {
logger.debug("redirect to: {}", authUrl);
}
@@ -369,9 +368,8 @@ public class AzureAdAuthenticator implements SsoAuthenticator {
if (logger.isDebugEnabled()) {
logger.debug("url: {}", url);
}
- try (CurlResponse response =
- Curl.get(url).header("Authorization", "Bearer " + user.getAuthenticationResult().getAccessToken())
- .header("Accept", "application/json").execute()) {
+ try (CurlResponse response = Curl.get(url).header("Authorization", "Bearer " + user.getAuthenticationResult().getAccessToken())
+ .header("Accept", "application/json").execute()) {
final Map<String, Object> contentMap = response.getContent(EcrCurl.jsonParser());
if (logger.isDebugEnabled()) {
logger.debug("response: {}", contentMap);
@@ -441,44 +439,42 @@ public class AzureAdAuthenticator implements SsoAuthenticator {
protected Pair<String[], String[]> getParentGroup(final AzureAdUser user, final String id) {
try {
- return groupCache.get(
- id,
- () -> {
- final List<String> groupList = new ArrayList<>();
- final List<String> roleList = new ArrayList<>();
- final String url = "https://graph.microsoft.com/v1.0/groups/" + id + "/getMemberGroups";
- if (logger.isDebugEnabled()) {
- logger.debug("url: {}", url);
- }
- try (CurlResponse response =
- Curl.post(url).header("Authorization", "Bearer " + user.getAuthenticationResult().getAccessToken())
- .header("Accept", "application/json").header("Content-type", "application/json")
- .body("{\"securityEnabledOnly\":false}").execute()) {
- final Map<String, Object> contentMap = response.getContent(EcrCurl.jsonParser());
- if (logger.isDebugEnabled()) {
- logger.debug("response: {}", contentMap);
- }
- if (contentMap.containsKey("value")) {
- final String[] values = DocumentUtil.getValue(contentMap, "value", String[].class);
- if (values != null) {
- for (final String value : values) {
- processGroup(user, groupList, roleList, value);
- if (!groupList.contains(value) && !roleList.contains(value)) {
- final Pair<String[], String[]> groupsAndRoles = getParentGroup(user, value);
- StreamUtil.stream(groupsAndRoles.getFirst()).of(stream1 -> stream1.forEach(groupList::add));
- StreamUtil.stream(groupsAndRoles.getSecond()).of(stream2 -> stream2.forEach(roleList::add));
- }
- }
+ return groupCache.get(id, () -> {
+ final List<String> groupList = new ArrayList<>();
+ final List<String> roleList = new ArrayList<>();
+ final String url = "https://graph.microsoft.com/v1.0/groups/" + id + "/getMemberGroups";
+ if (logger.isDebugEnabled()) {
+ logger.debug("url: {}", url);
+ }
+ try (CurlResponse response =
+ Curl.post(url).header("Authorization", "Bearer " + user.getAuthenticationResult().getAccessToken())
+ .header("Accept", "application/json").header("Content-type", "application/json")
+ .body("{\"securityEnabledOnly\":false}").execute()) {
+ final Map<String, Object> contentMap = response.getContent(EcrCurl.jsonParser());
+ if (logger.isDebugEnabled()) {
+ logger.debug("response: {}", contentMap);
+ }
+ if (contentMap.containsKey("value")) {
+ final String[] values = DocumentUtil.getValue(contentMap, "value", String[].class);
+ if (values != null) {
+ for (final String value : values) {
+ processGroup(user, groupList, roleList, value);
+ if (!groupList.contains(value) && !roleList.contains(value)) {
+ final Pair<String[], String[]> groupsAndRoles = getParentGroup(user, value);
+ StreamUtil.stream(groupsAndRoles.getFirst()).of(stream1 -> stream1.forEach(groupList::add));
+ StreamUtil.stream(groupsAndRoles.getSecond()).of(stream2 -> stream2.forEach(roleList::add));
}
- } else if (contentMap.containsKey("error")) {
- logger.warn("Failed to access parent groups: {}", contentMap);
}
- } catch (final IOException e) {
- logger.warn("Failed to access groups/roles in AzureAD.", e);
}
- return new Pair<>(groupList.stream().distinct().toArray(n1 -> new String[n1]), roleList.stream().distinct()
- .toArray(n2 -> new String[n2]));
- });
+ } else if (contentMap.containsKey("error")) {
+ logger.warn("Failed to access parent groups: {}", contentMap);
+ }
+ } catch (final IOException e) {
+ logger.warn("Failed to access groups/roles in AzureAD.", e);
+ }
+ return new Pair<>(groupList.stream().distinct().toArray(n1 -> new String[n1]),
+ roleList.stream().distinct().toArray(n2 -> new String[n2]));
+ });
} catch (final ExecutionException e) {
logger.warn("Failed to process a group cache.", e);
return new Pair<>(StringUtil.EMPTY_STRINGS, StringUtil.EMPTY_STRINGS);
@@ -490,9 +486,8 @@ public class AzureAdAuthenticator implements SsoAuthenticator {
if (logger.isDebugEnabled()) {
logger.debug("url: {}", url);
}
- try (CurlResponse response =
- Curl.get(url).header("Authorization", "Bearer " + user.getAuthenticationResult().getAccessToken())
- .header("Accept", "application/json").execute()) {
+ try (CurlResponse response = Curl.get(url).header("Authorization", "Bearer " + user.getAuthenticationResult().getAccessToken())
+ .header("Accept", "application/json").execute()) {
final Map<String, Object> contentMap = response.getContent(EcrCurl.jsonParser());
if (logger.isDebugEnabled()) {
logger.debug("response: {}", contentMap);
diff --git a/src/main/java/org/codelibs/fess/sso/saml/SamlAuthenticator.java b/src/main/java/org/codelibs/fess/sso/saml/SamlAuthenticator.java
index a64b2f4b8..9c678a2dd 100644
--- a/src/main/java/org/codelibs/fess/sso/saml/SamlAuthenticator.java
+++ b/src/main/java/org/codelibs/fess/sso/saml/SamlAuthenticator.java
@@ -125,61 +125,59 @@ public class SamlAuthenticator implements SsoAuthenticator {
@Override
public LoginCredential getLoginCredential() {
- return LaRequestUtil
- .getOptionalRequest()
- .map(request -> {
- if (logger.isDebugEnabled()) {
- logger.debug("Logging in with SAML Authenticator");
- }
-
- final HttpServletResponse response = LaResponseUtil.getResponse();
+ return LaRequestUtil.getOptionalRequest().map(request -> {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Logging in with SAML Authenticator");
+ }
- final HttpSession session = request.getSession(false);
- if (session != null) {
- final String sesState = (String) session.getAttribute(SAML_STATE);
- if (StringUtil.isNotBlank(sesState)) {
- session.removeAttribute(SAML_STATE);
- try {
- final Auth auth = new Auth(getSettings(), request, response);
- auth.processResponse();
+ final HttpServletResponse response = LaResponseUtil.getResponse();
- if (!auth.isAuthenticated()) {
- if (logger.isDebugEnabled()) {
- logger.debug("Authentication is failed.");
- }
- return null;
- }
+ final HttpSession session = request.getSession(false);
+ if (session != null) {
+ final String sesState = (String) session.getAttribute(SAML_STATE);
+ if (StringUtil.isNotBlank(sesState)) {
+ session.removeAttribute(SAML_STATE);
+ try {
+ final Auth auth = new Auth(getSettings(), request, response);
+ auth.processResponse();
- final List<String> errors = auth.getErrors();
- if (!errors.isEmpty()) {
- logger.warn("{}", errors.stream().collect(Collectors.joining(", ")));
- if (auth.isDebugActive() && StringUtil.isNotBlank(auth.getLastErrorReason())) {
- logger.warn("Authentication Failure: {} - Reason: {}",
- errors.stream().collect(Collectors.joining(", ")), auth.getLastErrorReason());
- } else {
- logger.warn("Authentication Failure: {}", errors.stream().collect(Collectors.joining(", ")));
- }
- return null;
- }
+ if (!auth.isAuthenticated()) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Authentication is failed.");
+ }
+ return null;
+ }
- return new SamlCredential(auth);
- } catch (final Exception e) {
- logger.warn("Authentication is failed.", e);
- return null;
+ final List<String> errors = auth.getErrors();
+ if (!errors.isEmpty()) {
+ logger.warn("{}", errors.stream().collect(Collectors.joining(", ")));
+ if (auth.isDebugActive() && StringUtil.isNotBlank(auth.getLastErrorReason())) {
+ logger.warn("Authentication Failure: {} - Reason: {}", errors.stream().collect(Collectors.joining(", ")),
+ auth.getLastErrorReason());
+ } else {
+ logger.warn("Authentication Failure: {}", errors.stream().collect(Collectors.joining(", ")));
}
+ return null;
}
- }
- try {
- final Auth auth = new Auth(getSettings(), request, response);
- final String loginUrl = auth.login(null, false, false, true, true);
- request.getSession().setAttribute(SAML_STATE, UuidUtil.create());
- return new ActionResponseCredential(() -> HtmlResponse.fromRedirectPathAsIs(loginUrl));
+ return new SamlCredential(auth);
} catch (final Exception e) {
- throw new SsoLoginException("Invalid SAML redirect URL.", e);
+ logger.warn("Authentication is failed.", e);
+ return null;
}
+ }
+ }
- }).orElseGet(() -> null);
+ try {
+ final Auth auth = new Auth(getSettings(), request, response);
+ final String loginUrl = auth.login(null, false, false, true, true);
+ request.getSession().setAttribute(SAML_STATE, UuidUtil.create());
+ return new ActionResponseCredential(() -> HtmlResponse.fromRedirectPathAsIs(loginUrl));
+ } catch (final Exception e) {
+ throw new SsoLoginException("Invalid SAML redirect URL.", e);
+ }
+
+ }).orElseGet(() -> null);
}
@Override
@@ -191,23 +189,21 @@ public class SamlAuthenticator implements SsoAuthenticator {
@Override
public String logout(final FessUserBean user) {
if (user.getFessUser() instanceof SamlUser) {
- return LaRequestUtil
- .getOptionalRequest()
- .map(request -> {
- if (logger.isDebugEnabled()) {
- logger.debug("Logging out with SAML Authenticator");
- }
- final HttpServletResponse response = LaResponseUtil.getResponse();
- final SamlUser samlUser = (SamlUser) user.getFessUser();
- try {
- final Auth auth = new Auth(getSettings(), request, response);
- return auth.logout(null, samlUser.getName(), samlUser.getSessionIndex(), true, samlUser.getNameIdFormat(),
- samlUser.getNameidNameQualifier(), samlUser.getNameidSPNameQualifier());
- } catch (final Exception e) {
- logger.warn("Failed to logout from IdP: {}", samlUser, e);
- }
- return null;
- }).orElse(null);
+ return LaRequestUtil.getOptionalRequest().map(request -> {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Logging out with SAML Authenticator");
+ }
+ final HttpServletResponse response = LaResponseUtil.getResponse();
+ final SamlUser samlUser = (SamlUser) user.getFessUser();
+ try {
+ final Auth auth = new Auth(getSettings(), request, response);
+ return auth.logout(null, samlUser.getName(), samlUser.getSessionIndex(), true, samlUser.getNameIdFormat(),
+ samlUser.getNameidNameQualifier(), samlUser.getNameidSPNameQualifier());
+ } catch (final Exception e) {
+ logger.warn("Failed to logout from IdP: {}", samlUser, e);
+ }
+ return null;
+ }).orElse(null);
}
return null;
}
@@ -225,74 +221,69 @@ public class SamlAuthenticator implements SsoAuthenticator {
}
protected ActionResponse getMetadataResponse() {
- return LaRequestUtil
- .getOptionalRequest()
- .map(request -> {
- if (logger.isDebugEnabled()) {
- logger.debug("Accessing metadata with SAML Authenticator");
- }
- final HttpServletResponse response = LaResponseUtil.getResponse();
- try {
- final Auth auth = new Auth(getSettings(), request, response);
- final Saml2Settings settings = auth.getSettings();
- settings.setSPValidationOnly(true);
- final String metadata = settings.getSPMetadata();
- final List<String> errors = Saml2Settings.validateMetadata(metadata);
- if (errors.isEmpty()) {
- return new StreamResponse("metadata").contentType("application/xhtml+xml").stream(out -> {
- try (final Writer writer = new OutputStreamWriter(out.stream(), Constants.UTF_8_CHARSET)) {
- writer.write(metadata);
- }
- });
- } else {
- final String msg = errors.stream().collect(Collectors.joining(", "));
- throw new SsoMessageException(messages -> messages.addErrorsFailedToProcessSsoRequest(
- UserMessages.GLOBAL_PROPERTY_KEY, msg), "Failed to log out.", new SsoProcessException(msg));
+ return LaRequestUtil.getOptionalRequest().map(request -> {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Accessing metadata with SAML Authenticator");
+ }
+ final HttpServletResponse response = LaResponseUtil.getResponse();
+ try {
+ final Auth auth = new Auth(getSettings(), request, response);
+ final Saml2Settings settings = auth.getSettings();
+ settings.setSPValidationOnly(true);
+ final String metadata = settings.getSPMetadata();
+ final List<String> errors = Saml2Settings.validateMetadata(metadata);
+ if (errors.isEmpty()) {
+ return new StreamResponse("metadata").contentType("application/xhtml+xml").stream(out -> {
+ try (final Writer writer = new OutputStreamWriter(out.stream(), Constants.UTF_8_CHARSET)) {
+ writer.write(metadata);
}
- } catch (final SsoMessageException e) {
- throw e;
- } catch (final Exception e) {
- throw new SsoMessageException(messages -> messages.addErrorsFailedToProcessSsoRequest(
- UserMessages.GLOBAL_PROPERTY_KEY, e.getMessage()), "Failed to process metadata.", e);
- }
- })
- .orElseThrow(
- () -> new SsoMessageException(messages -> messages.addErrorsFailedToProcessSsoRequest(
- UserMessages.GLOBAL_PROPERTY_KEY, "Invalid state."), "Failed to process metadata.",
- new SsoProcessException("Invalid state.")));
+ });
+ } else {
+ final String msg = errors.stream().collect(Collectors.joining(", "));
+ throw new SsoMessageException(
+ messages -> messages.addErrorsFailedToProcessSsoRequest(UserMessages.GLOBAL_PROPERTY_KEY, msg),
+ "Failed to log out.", new SsoProcessException(msg));
+ }
+ } catch (final SsoMessageException e) {
+ throw e;
+ } catch (final Exception e) {
+ throw new SsoMessageException(
+ messages -> messages.addErrorsFailedToProcessSsoRequest(UserMessages.GLOBAL_PROPERTY_KEY, e.getMessage()),
+ "Failed to process metadata.", e);
+ }
+ }).orElseThrow(() -> new SsoMessageException(
+ messages -> messages.addErrorsFailedToProcessSsoRequest(UserMessages.GLOBAL_PROPERTY_KEY, "Invalid state."),
+ "Failed to process metadata.", new SsoProcessException("Invalid state.")));
}
protected ActionResponse getLogoutResponse() {
- LaRequestUtil
- .getOptionalRequest()
- .map(request -> {
- if (logger.isDebugEnabled()) {
- logger.debug("Logging out with SAML Authenticator");
- }
- final HttpServletResponse response = LaResponseUtil.getResponse();
- try {
- final Auth auth = new Auth(getSettings(), request, response);
- auth.processSLO();
- final List<String> errors = auth.getErrors();
- if (errors.isEmpty()) {
- throw new SsoMessageException(messages -> messages.addSuccessSsoLogout(UserMessages.GLOBAL_PROPERTY_KEY),
- "Logged out");
- } else {
- final String msg = errors.stream().collect(Collectors.joining(", "));
- throw new SsoMessageException(messages -> messages.addErrorsFailedToProcessSsoRequest(
- UserMessages.GLOBAL_PROPERTY_KEY, msg), "Failed to log out.", new SsoProcessException(msg));
- }
- } catch (final SsoMessageException e) {
- throw e;
- } catch (final Exception e) {
- throw new SsoMessageException(messages -> messages.addErrorsFailedToProcessSsoRequest(
- UserMessages.GLOBAL_PROPERTY_KEY, e.getMessage()), "Failed to log out.", e);
- }
- })
- .orElseThrow(
- () -> new SsoMessageException(messages -> messages.addErrorsFailedToProcessSsoRequest(
- UserMessages.GLOBAL_PROPERTY_KEY, "Invalid state."), "Failed to log out.", new SsoProcessException(
- "Invalid state.")));
+ LaRequestUtil.getOptionalRequest().map(request -> {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Logging out with SAML Authenticator");
+ }
+ final HttpServletResponse response = LaResponseUtil.getResponse();
+ try {
+ final Auth auth = new Auth(getSettings(), request, response);
+ auth.processSLO();
+ final List<String> errors = auth.getErrors();
+ if (errors.isEmpty()) {
+ throw new SsoMessageException(messages -> messages.addSuccessSsoLogout(UserMessages.GLOBAL_PROPERTY_KEY), "Logged out");
+ } else {
+ final String msg = errors.stream().collect(Collectors.joining(", "));
+ throw new SsoMessageException(
+ messages -> messages.addErrorsFailedToProcessSsoRequest(UserMessages.GLOBAL_PROPERTY_KEY, msg),
+ "Failed to log out.", new SsoProcessException(msg));
+ }
+ } catch (final SsoMessageException e) {
+ throw e;
+ } catch (final Exception e) {
+ throw new SsoMessageException(
+ messages -> messages.addErrorsFailedToProcessSsoRequest(UserMessages.GLOBAL_PROPERTY_KEY, e.getMessage()),
+ "Failed to log out.", e);
+ }
+ }).orElseThrow(() -> new SsoMessageException(
+ messages -> messages.addErrorsFailedToProcessSsoRequest(UserMessages.GLOBAL_PROPERTY_KEY, "Invalid state."),
+ "Failed to log out.", new SsoProcessException("Invalid state.")));
return null;
}
}
diff --git a/src/main/java/org/codelibs/fess/sso/spnego/SpnegoAuthenticator.java b/src/main/java/org/codelibs/fess/sso/spnego/SpnegoAuthenticator.java
index dcf77b349..444b4e081 100644
--- a/src/main/java/org/codelibs/fess/sso/spnego/SpnegoAuthenticator.java
+++ b/src/main/java/org/codelibs/fess/sso/spnego/SpnegoAuthenticator.java
@@ -103,61 +103,59 @@ public class SpnegoAuthenticator implements SsoAuthenticator {
*/
@Override
public LoginCredential getLoginCredential() {
- return LaRequestUtil
- .getOptionalRequest()
- .map(request -> {
- if (logger.isDebugEnabled()) {
- logger.debug("Logging in with SPNEGO Authenticator");
- }
- final HttpServletResponse response = LaResponseUtil.getResponse();
- final SpnegoHttpServletResponse spnegoResponse = new SpnegoHttpServletResponse(response);
+ return LaRequestUtil.getOptionalRequest().map(request -> {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Logging in with SPNEGO Authenticator");
+ }
+ final HttpServletResponse response = LaResponseUtil.getResponse();
+ final SpnegoHttpServletResponse spnegoResponse = new SpnegoHttpServletResponse(response);
- // client/caller principal
- final SpnegoPrincipal principal;
- try {
- principal = getAuthenticator().authenticate(request, spnegoResponse);
- if (logger.isDebugEnabled()) {
- logger.debug("principal: {}", principal);
- }
- } catch (final Exception e) {
- final String msg = "HTTP Authorization Header=" + request.getHeader(Constants.AUTHZ_HEADER);
- if (logger.isDebugEnabled()) {
- logger.debug(msg);
- }
- throw new SsoLoginException(msg, e);
- }
+ // client/caller principal
+ final SpnegoPrincipal principal;
+ try {
+ principal = getAuthenticator().authenticate(request, spnegoResponse);
+ if (logger.isDebugEnabled()) {
+ logger.debug("principal: {}", principal);
+ }
+ } catch (final Exception e) {
+ final String msg = "HTTP Authorization Header=" + request.getHeader(Constants.AUTHZ_HEADER);
+ if (logger.isDebugEnabled()) {
+ logger.debug(msg);
+ }
+ throw new SsoLoginException(msg, e);
+ }
- // context/auth loop not yet complete
- final boolean status = spnegoResponse.isStatusSet();
- if (logger.isDebugEnabled()) {
- logger.debug("isStatusSet: {}", status);
- }
- if (status) {
- return new ActionResponseCredential(() -> {
- throw new RequestLoggingFilter.RequestClientErrorException("Your request is not authorized.",
- "401 Unauthorized", HttpServletResponse.SC_UNAUTHORIZED);
- });
- }
+ // context/auth loop not yet complete
+ final boolean status = spnegoResponse.isStatusSet();
+ if (logger.isDebugEnabled()) {
+ logger.debug("isStatusSet: {}", status);
+ }
+ if (status) {
+ return new ActionResponseCredential(() -> {
+ throw new RequestLoggingFilter.RequestClientErrorException("Your request is not authorized.", "401 Unauthorized",
+ HttpServletResponse.SC_UNAUTHORIZED);
+ });
+ }
- // assert
- if (null == principal) {
- final String msg = "Principal was null.";
- if (logger.isDebugEnabled()) {
- logger.debug(msg);
- }
- throw new SsoLoginException(msg);
- }
+ // assert
+ if (null == principal) {
+ final String msg = "Principal was null.";
+ if (logger.isDebugEnabled()) {
+ logger.debug(msg);
+ }
+ throw new SsoLoginException(msg);
+ }
- if (logger.isDebugEnabled()) {
- logger.debug("principal={}", principal);
- }
+ if (logger.isDebugEnabled()) {
+ logger.debug("principal={}", principal);
+ }
- final String[] username = principal.getName().split("@", 2);
- if (logger.isDebugEnabled()) {
- logger.debug("username: {}", Arrays.toString(username));
- }
- return new SpnegoCredential(username[0]);
- }).orElseGet(() -> null);
+ final String[] username = principal.getName().split("@", 2);
+ if (logger.isDebugEnabled()) {
+ logger.debug("username: {}", Arrays.toString(username));
+ }
+ return new SpnegoCredential(username[0]);
+ }).orElseGet(() -> null);
}
diff --git a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java
index 123aa9749..e3dde7513 100644
--- a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java
+++ b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java
@@ -76,11 +76,11 @@ public class FessFunctions {
private static final String PDF_DATE = "pdf_date";
- private static final Pattern EMAIL_ADDRESS_PATTERN = Pattern.compile("[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,6}",
- Pattern.CASE_INSENSITIVE);
+ private static final Pattern EMAIL_ADDRESS_PATTERN =
+ Pattern.compile("[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,6}", Pattern.CASE_INSENSITIVE);
- private static LoadingCache<String, Long> resourceHashCache = CacheBuilder.newBuilder().maximumSize(1000)
- .expireAfterWrite(10, TimeUnit.MINUTES).build(new CacheLoader<String, Long>() {
+ private static LoadingCache<String, Long> resourceHashCache =
+ CacheBuilder.newBuilder().maximumSize(1000).expireAfterWrite(10, TimeUnit.MINUTES).build(new CacheLoader<String, Long>() {
@Override
public Long load(final String key) throws Exception {
try {
diff --git a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
index e26afcc4a..a0bf9619f 100644
--- a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
+++ b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
@@ -384,14 +384,12 @@ public class ThumbnailManager {
if (!deleteFileMap.isEmpty()) {
final String docIdField = fessConfig.getIndexFieldDocId();
- fessEsClient.getDocumentList(
- fessConfig.getIndexDocumentSearchIndex(),
- searchRequestBuilder -> {
- searchRequestBuilder.setQuery(QueryBuilders.termsQuery(docIdField,
- deleteFileMap.keySet().toArray(new String[deleteFileMap.size()])));
- searchRequestBuilder.setFetchSource(new String[] { docIdField }, StringUtil.EMPTY_STRINGS);
- return true;
- }).forEach(m -> {
+ fessEsClient.getDocumentList(fessConfig.getIndexDocumentSearchIndex(), searchRequestBuilder -> {
+ searchRequestBuilder.setQuery(
+ QueryBuilders.termsQuery(docIdField, deleteFileMap.keySet().toArray(new String[deleteFileMap.size()])));
+ searchRequestBuilder.setFetchSource(new String[] { docIdField }, StringUtil.EMPTY_STRINGS);
+ return true;
+ }).forEach(m -> {
final Object docId = m.get(docIdField);
if (docId != null) {
deleteFileMap.remove(docId);
@@ -505,14 +503,14 @@ public class ThumbnailManager {
Files.createDirectories(newPath.getParent());
} catch (final FileAlreadyExistsException e) {
// ignore
+ }
+ Files.move(path, newPath);
+ logger.info("Move {} to {}", path, newPath);
+ } catch (final IOException e) {
+ logger.warn("Failed to move " + path, e);
+ }
}
- Files.move(path, newPath);
- logger.info("Move {} to {}", path, newPath);
- } catch (final IOException e) {
- logger.warn("Failed to move " + path, e);
- }
- }
- } );
+ });
} catch (final IOException e) {
logger.warn("Failed to migrate thumbnail images.", e);
}
diff --git a/src/main/java/org/codelibs/fess/thumbnail/impl/BaseThumbnailGenerator.java b/src/main/java/org/codelibs/fess/thumbnail/impl/BaseThumbnailGenerator.java
index adfbe6785..0f8efaf8b 100644
--- a/src/main/java/org/codelibs/fess/thumbnail/impl/BaseThumbnailGenerator.java
+++ b/src/main/java/org/codelibs/fess/thumbnail/impl/BaseThumbnailGenerator.java
@@ -163,9 +163,8 @@ public abstract class BaseThumbnailGenerator implements ThumbnailGenerator {
final FessEsClient fessEsClient = ComponentUtil.getFessEsClient();
final IndexingHelper indexingHelper = ComponentUtil.getIndexingHelper();
try {
- final Map<String, Object> doc =
- indexingHelper.getDocument(fessEsClient, id,
- new String[] { fessConfig.getIndexFieldThumbnail(), fessConfig.getIndexFieldConfigId() });
+ final Map<String, Object> doc = indexingHelper.getDocument(fessEsClient, id,
+ new String[] { fessConfig.getIndexFieldThumbnail(), fessConfig.getIndexFieldConfigId() });
if (doc == null) {
throw new ThumbnailGenerationException("Document is not found: " + id);
}
@@ -191,49 +190,47 @@ public abstract class BaseThumbnailGenerator implements ThumbnailGenerator {
}
protected boolean process(final String id, final Predicate<ResponseData> consumer) {
- return process(
- id,
- (configId, url) -> {
- final CrawlingConfigHelper crawlingConfigHelper = ComponentUtil.getCrawlingConfigHelper();
- final CrawlingConfig config = crawlingConfigHelper.getCrawlingConfig(configId);
- if (config == null) {
- throw new ThumbnailGenerationException("No CrawlingConfig: " + configId);
- }
+ return process(id, (configId, url) -> {
+ final CrawlingConfigHelper crawlingConfigHelper = ComponentUtil.getCrawlingConfigHelper();
+ final CrawlingConfig config = crawlingConfigHelper.getCrawlingConfig(configId);
+ if (config == null) {
+ throw new ThumbnailGenerationException("No CrawlingConfig: " + configId);
+ }
- if (logger.isInfoEnabled()) {
- logger.info("Generating Thumbnail: {}", url);
- }
+ if (logger.isInfoEnabled()) {
+ logger.info("Generating Thumbnail: {}", url);
+ }
- final CrawlerClientFactory crawlerClientFactory =
- config.initializeClientFactory(() -> ComponentUtil.getComponent(CrawlerClientFactory.class));
- final CrawlerClient client = crawlerClientFactory.getClient(url);
- if (client == null) {
- throw new ThumbnailGenerationException("No CrawlerClient: " + configId + ", url: " + url);
+ final CrawlerClientFactory crawlerClientFactory =
+ config.initializeClientFactory(() -> ComponentUtil.getComponent(CrawlerClientFactory.class));
+ final CrawlerClient client = crawlerClientFactory.getClient(url);
+ if (client == null) {
+ throw new ThumbnailGenerationException("No CrawlerClient: " + configId + ", url: " + url);
+ }
+ String u = url;
+ for (int i = 0; i < maxRedirectCount; i++) {
+ try (final ResponseData responseData = client.execute(RequestDataBuilder.newRequestData().get().url(u).build())) {
+ if (StringUtil.isNotBlank(responseData.getRedirectLocation())) {
+ u = responseData.getRedirectLocation();
+ continue;
}
- String u = url;
- for (int i = 0; i < maxRedirectCount; i++) {
- try (final ResponseData responseData = client.execute(RequestDataBuilder.newRequestData().get().url(u).build())) {
- if (StringUtil.isNotBlank(responseData.getRedirectLocation())) {
- u = responseData.getRedirectLocation();
- continue;
- }
- if (StringUtil.isBlank(responseData.getUrl())) {
- throw new ThumbnailGenerationException("Failed to process a thumbnail content: " + url
- + " (Response URL is empty)");
- }
- return consumer.test(responseData);
- } catch (final CrawlingAccessException e) {
- if (logger.isDebugEnabled()) {
- throw new ThumbnailGenerationException("Failed to process a thumbnail content: " + url, e);
- } else {
- throw new ThumbnailGenerationException(e.getMessage());
- }
- } catch (final Exception e) {
- throw new ThumbnailGenerationException("Failed to process a thumbnail content: " + url, e);
- }
+ if (StringUtil.isBlank(responseData.getUrl())) {
+ throw new ThumbnailGenerationException(
+ "Failed to process a thumbnail content: " + url + " (Response URL is empty)");
+ }
+ return consumer.test(responseData);
+ } catch (final CrawlingAccessException e) {
+ if (logger.isDebugEnabled()) {
+ throw new ThumbnailGenerationException("Failed to process a thumbnail content: " + url, e);
+ } else {
+ throw new ThumbnailGenerationException(e.getMessage());
}
- throw new ThumbnailGenerationException("Failed to process a thumbnail content: " + url + " (Redirect Loop)");
- });
+ } catch (final Exception e) {
+ throw new ThumbnailGenerationException("Failed to process a thumbnail content: " + url, e);
+ }
+ }
+ throw new ThumbnailGenerationException("Failed to process a thumbnail content: " + url + " (Redirect Loop)");
+ });
}
public void setGeneratorList(final List<String> generatorList) {
diff --git a/src/main/java/org/codelibs/fess/thumbnail/impl/HtmlTagBasedGenerator.java b/src/main/java/org/codelibs/fess/thumbnail/impl/HtmlTagBasedGenerator.java
index f211709ab..eb206a148 100644
--- a/src/main/java/org/codelibs/fess/thumbnail/impl/HtmlTagBasedGenerator.java
+++ b/src/main/java/org/codelibs/fess/thumbnail/impl/HtmlTagBasedGenerator.java
@@ -78,54 +78,52 @@ public class HtmlTagBasedGenerator extends BaseThumbnailGenerator {
return false;
}
- return process(
- thumbnailId,
- responseData -> {
- if (!isImageMimeType(responseData)) {
- if (logger.isDebugEnabled()) {
- logger.debug("Thumbnail is not image: {} : {}", thumbnailId, responseData.getUrl());
- }
- updateThumbnailField(thumbnailId, StringUtil.EMPTY);
- return false;
+ return process(thumbnailId, responseData -> {
+ if (!isImageMimeType(responseData)) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Thumbnail is not image: {} : {}", thumbnailId, responseData.getUrl());
+ }
+ updateThumbnailField(thumbnailId, StringUtil.EMPTY);
+ return false;
+ }
+ boolean created = false;
+ try (ImageInputStream input = ImageIO.createImageInputStream(responseData.getResponseBody())) {
+ switch (saveImage(input, outputFile)) {
+ case OK:
+ created = true;
+ break;
+ case FAILED:
+ logger.warn("Failed to create thumbnail: {} -> {}", thumbnailId, responseData.getUrl());
+ break;
+ case INVALID_SIZE:
+ logger.info("Unmatched thumbnail size: {} -> {}", thumbnailId, responseData.getUrl());
+ break;
+ case NO_IMAGE:
+ if (logger.isDebugEnabled()) {
+ logger.debug("No thumbnail: {} -> {}", thumbnailId, responseData.getUrl());
}
- boolean created = false;
- try (ImageInputStream input = ImageIO.createImageInputStream(responseData.getResponseBody())) {
- switch (saveImage(input, outputFile)) {
- case OK:
- created = true;
- break;
- case FAILED:
- logger.warn("Failed to create thumbnail: {} -> {}", thumbnailId, responseData.getUrl());
- break;
- case INVALID_SIZE:
- logger.info("Unmatched thumbnail size: {} -> {}", thumbnailId, responseData.getUrl());
- break;
- case NO_IMAGE:
- if (logger.isDebugEnabled()) {
- logger.debug("No thumbnail: {} -> {}", thumbnailId, responseData.getUrl());
- }
- break;
- default:
- logger.error("Unknown thumbnail result: {} -> {}", thumbnailId, responseData.getUrl());
- break;
- }
- } catch (final Throwable t) {
- if (logger.isDebugEnabled()) {
- logger.warn("Failed to create thumbnail: " + thumbnailId + " -> " + responseData.getUrl(), t);
- } else {
- logger.warn("Failed to create thumbnail: " + thumbnailId + " -> " + responseData.getUrl() + " ("
- + t.getClass().getCanonicalName() + ": " + t.getMessage() + ")");
- }
- } finally {
- if (!created) {
- updateThumbnailField(thumbnailId, StringUtil.EMPTY);
- if (outputFile.exists() && !outputFile.delete()) {
- logger.warn("Failed to delete {}", outputFile.getAbsolutePath());
- }
- }
+ break;
+ default:
+ logger.error("Unknown thumbnail result: {} -> {}", thumbnailId, responseData.getUrl());
+ break;
+ }
+ } catch (final Throwable t) {
+ if (logger.isDebugEnabled()) {
+ logger.warn("Failed to create thumbnail: " + thumbnailId + " -> " + responseData.getUrl(), t);
+ } else {
+ logger.warn("Failed to create thumbnail: " + thumbnailId + " -> " + responseData.getUrl() + " ("
+ + t.getClass().getCanonicalName() + ": " + t.getMessage() + ")");
+ }
+ } finally {
+ if (!created) {
+ updateThumbnailField(thumbnailId, StringUtil.EMPTY);
+ if (outputFile.exists() && !outputFile.delete()) {
+ logger.warn("Failed to delete {}", outputFile.getAbsolutePath());
}
- return outputFile.exists();
- });
+ }
+ }
+ return outputFile.exists();
+ });
}
@@ -168,8 +166,8 @@ public class HtmlTagBasedGenerator extends BaseThumbnailGenerator {
param.setSourceRegion(new Rectangle(width, height > width ? width : height));
final BufferedImage image = reader.read(0, param);
final int thumbnailWidth = fessConfig.getThumbnailHtmlImageThumbnailWidthAsInteger();
- final int thumbnailHeight =
- (int) ((height > width ? width : height) * fessConfig.getThumbnailHtmlImageThumbnailWidthAsInteger().floatValue() / width);
+ final int thumbnailHeight = (int) ((height > width ? width : height)
+ * fessConfig.getThumbnailHtmlImageThumbnailWidthAsInteger().floatValue() / width);
final BufferedImage thumbnail = new BufferedImage(thumbnailWidth, thumbnailHeight, image.getType());
thumbnail.getGraphics().drawImage(image.getScaledInstance(thumbnailWidth, thumbnailHeight, Image.SCALE_AREA_AVERAGING), 0,
0, thumbnailWidth, thumbnailHeight, null);
diff --git a/src/main/java/org/codelibs/fess/util/DocumentUtil.java b/src/main/java/org/codelibs/fess/util/DocumentUtil.java
index cd49c4e2f..0e13cddfe 100644
--- a/src/main/java/org/codelibs/fess/util/DocumentUtil.java
+++ b/src/main/java/org/codelibs/fess/util/DocumentUtil.java
@@ -135,9 +135,8 @@ public final class DocumentUtil {
}
public static String encodeUrl(final String url) {
- final String enc =
- LaRequestUtil.getOptionalRequest().filter(req -> req.getCharacterEncoding() != null)
- .map(HttpServletRequest::getCharacterEncoding).orElse(Constants.UTF_8);
+ final String enc = LaRequestUtil.getOptionalRequest().filter(req -> req.getCharacterEncoding() != null)
+ .map(HttpServletRequest::getCharacterEncoding).orElse(Constants.UTF_8);
final StringBuilder buf = new StringBuilder(url.length() + 100);
for (final char c : url.toCharArray()) {
if (CharUtil.isUrlChar(c)) {
diff --git a/src/main/java/org/codelibs/fess/util/FacetResponse.java b/src/main/java/org/codelibs/fess/util/FacetResponse.java
index 4bb1c05e6..b091310b1 100644
--- a/src/main/java/org/codelibs/fess/util/FacetResponse.java
+++ b/src/main/java/org/codelibs/fess/util/FacetResponse.java
@@ -34,19 +34,17 @@ public class FacetResponse {
protected List<Field> fieldList = new ArrayList<>();
public FacetResponse(final Aggregations aggregations) {
- aggregations
- .forEach(aggregation -> {
- if (aggregation.getName().startsWith(Constants.FACET_FIELD_PREFIX)) {
- final Terms termFacet = (Terms) aggregation;
- fieldList.add(new Field(termFacet));
- } else if (aggregation.getName().startsWith(Constants.FACET_QUERY_PREFIX)) {
- final Filter queryFacet = (Filter) aggregation;
- final String encodedQuery = queryFacet.getName().substring(Constants.FACET_QUERY_PREFIX.length());
- queryCountMap.put(new String(BaseEncoding.base64().decode(encodedQuery), StandardCharsets.UTF_8),
- queryFacet.getDocCount());
- }
-
- });
+ aggregations.forEach(aggregation -> {
+ if (aggregation.getName().startsWith(Constants.FACET_FIELD_PREFIX)) {
+ final Terms termFacet = (Terms) aggregation;
+ fieldList.add(new Field(termFacet));
+ } else if (aggregation.getName().startsWith(Constants.FACET_QUERY_PREFIX)) {
+ final Filter queryFacet = (Filter) aggregation;
+ final String encodedQuery = queryFacet.getName().substring(Constants.FACET_QUERY_PREFIX.length());
+ queryCountMap.put(new String(BaseEncoding.base64().decode(encodedQuery), StandardCharsets.UTF_8), queryFacet.getDocCount());
+ }
+
+ });
}
public boolean hasFacetResponse() {
diff --git a/src/main/java/org/codelibs/fess/util/GsaConfigParser.java b/src/main/java/org/codelibs/fess/util/GsaConfigParser.java
index 881816d05..cff767fee 100644
--- a/src/main/java/org/codelibs/fess/util/GsaConfigParser.java
+++ b/src/main/java/org/codelibs/fess/util/GsaConfigParser.java
@@ -112,7 +112,8 @@ public class GsaConfigParser extends DefaultHandler {
}
@Override
- public void startElement(final String uri, final String localName, final String qName, final Attributes attributes) throws SAXException {
+ public void startElement(final String uri, final String localName, final String qName, final Attributes attributes)
+ throws SAXException {
if (logger.isDebugEnabled()) {
logger.debug("Start Element: {}", qName);
}
@@ -159,13 +160,11 @@ public class GsaConfigParser extends DefaultHandler {
final Object startUrls = globalParams.get(START_URLS);
if (startUrls != null) {
final long now = System.currentTimeMillis();
- final List<String> urlList =
- split(startUrls.toString(), "\n").get(
- stream -> stream.map(String::trim).filter(StringUtil::isNotBlank).collect(Collectors.toList()));
+ final List<String> urlList = split(startUrls.toString(), "\n")
+ .get(stream -> stream.map(String::trim).filter(StringUtil::isNotBlank).collect(Collectors.toList()));
- final String webUrls =
- urlList.stream().filter(s -> Arrays.stream(webProtocols).anyMatch(p -> s.startsWith(p)))
- .collect(Collectors.joining("\n"));
+ final String webUrls = urlList.stream().filter(s -> Arrays.stream(webProtocols).anyMatch(p -> s.startsWith(p)))
+ .collect(Collectors.joining("\n"));
if (StringUtil.isNotBlank(webUrls)) {
webConfig = new WebConfig();
webConfig.setName("Default");
@@ -188,9 +187,8 @@ public class GsaConfigParser extends DefaultHandler {
webConfig.setUpdatedTime(now);
}
- final String fileUrls =
- urlList.stream().filter(s -> Arrays.stream(fileProtocols).anyMatch(p -> s.startsWith(p)))
- .collect(Collectors.joining("\n"));
+ final String fileUrls = urlList.stream().filter(s -> Arrays.stream(fileProtocols).anyMatch(p -> s.startsWith(p)))
+ .collect(Collectors.joining("\n"));
if (StringUtil.isNotBlank(fileUrls)) {
fileConfig = new FileConfig();
fileConfig.setName("Default");
@@ -229,8 +227,8 @@ public class GsaConfigParser extends DefaultHandler {
}
protected String parseFilterPaths(final String text, final boolean web, final boolean file) {
- return split(text, "\n").get(
- stream -> stream.map(String::trim).filter(StringUtil::isNotBlank).map(this::getFilterPath).filter(s -> {
+ return split(text, "\n")
+ .get(stream -> stream.map(String::trim).filter(StringUtil::isNotBlank).map(this::getFilterPath).filter(s -> {
if (StringUtil.isBlank(s)) {
return false;
}
diff --git a/src/main/java/org/codelibs/fess/util/QueryResponseList.java b/src/main/java/org/codelibs/fess/util/QueryResponseList.java
index dc79eb7e6..48e3794c1 100644
--- a/src/main/java/org/codelibs/fess/util/QueryResponseList.java
+++ b/src/main/java/org/codelibs/fess/util/QueryResponseList.java
@@ -103,43 +103,40 @@ public class QueryResponseList implements List<Map<String, Object>> {
}
// build highlighting fields
- final QueryHelper queryHelper = ComponentUtil.getQueryHelper();
- final String hlPrefix = queryHelper.getHighlightPrefix();
- for (final SearchHit searchHit : searchHits.getHits()) {
- final Map<String, Object> docMap = parseSearchHit(fessConfig, hlPrefix, searchHit);
-
- if (fessConfig.isResultCollapsed()) {
- final Map<String, SearchHits> innerHits = searchHit.getInnerHits();
- if (innerHits != null) {
- final SearchHits innerSearchHits = innerHits.get(fessConfig.getQueryCollapseInnerHitsName());
- if (innerSearchHits != null) {
- final long totalHits = innerSearchHits.getTotalHits().value;
- if (totalHits > 1) {
- docMap.put(fessConfig.getQueryCollapseInnerHitsName() + "_count", totalHits);
- final DocumentField bitsField = searchHit.getFields().get(fessConfig.getIndexFieldContentMinhashBits());
- if (bitsField != null && !bitsField.getValues().isEmpty()) {
- docMap.put(fessConfig.getQueryCollapseInnerHitsName() + "_hash", bitsField.getValues().get(0));
- }
- docMap.put(
- fessConfig.getQueryCollapseInnerHitsName(),
- StreamUtil.stream(innerSearchHits.getHits()).get(
- stream -> stream.map(v -> parseSearchHit(fessConfig, hlPrefix, v)).toArray(
- n -> new Map[n])));
+ final QueryHelper queryHelper = ComponentUtil.getQueryHelper();
+ final String hlPrefix = queryHelper.getHighlightPrefix();
+ for (final SearchHit searchHit : searchHits.getHits()) {
+ final Map<String, Object> docMap = parseSearchHit(fessConfig, hlPrefix, searchHit);
+
+ if (fessConfig.isResultCollapsed()) {
+ final Map<String, SearchHits> innerHits = searchHit.getInnerHits();
+ if (innerHits != null) {
+ final SearchHits innerSearchHits = innerHits.get(fessConfig.getQueryCollapseInnerHitsName());
+ if (innerSearchHits != null) {
+ final long totalHits = innerSearchHits.getTotalHits().value;
+ if (totalHits > 1) {
+ docMap.put(fessConfig.getQueryCollapseInnerHitsName() + "_count", totalHits);
+ final DocumentField bitsField = searchHit.getFields().get(fessConfig.getIndexFieldContentMinhashBits());
+ if (bitsField != null && !bitsField.getValues().isEmpty()) {
+ docMap.put(fessConfig.getQueryCollapseInnerHitsName() + "_hash", bitsField.getValues().get(0));
}
+ docMap.put(fessConfig.getQueryCollapseInnerHitsName(), StreamUtil.stream(innerSearchHits.getHits())
+ .get(stream -> stream.map(v -> parseSearchHit(fessConfig, hlPrefix, v)).toArray(n -> new Map[n])));
}
}
}
-
- parent.add(docMap);
}
- // facet
- final Aggregations aggregations = searchResponse.getAggregations();
- if (aggregations != null) {
- facetResponse = new FacetResponse(aggregations);
- }
+ parent.add(docMap);
+ }
- });
+ // facet
+ final Aggregations aggregations = searchResponse.getAggregations();
+ if (aggregations != null) {
+ facetResponse = new FacetResponse(aggregations);
+ }
+
+ });
if (pageSize > 0) {
calculatePageInfo(start, pageSize);
diff --git a/src/main/java/org/codelibs/fess/util/QueryStringBuilder.java b/src/main/java/org/codelibs/fess/util/QueryStringBuilder.java
index 72bc0cb12..36414a5f2 100644
--- a/src/main/java/org/codelibs/fess/util/QueryStringBuilder.java
+++ b/src/main/java/org/codelibs/fess/util/QueryStringBuilder.java
@@ -53,8 +53,8 @@ public class QueryStringBuilder {
queryBuf.append(query);
}
- stream(params.getExtraQueries()).of(
- stream -> stream.filter(q -> StringUtil.isNotBlank(q) && q.length() <= maxQueryLength).forEach(q -> {
+ stream(params.getExtraQueries())
+ .of(stream -> stream.filter(q -> StringUtil.isNotBlank(q) && q.length() <= maxQueryLength).forEach(q -> {
appendQuery(queryBuf, q);
}));
@@ -135,39 +135,36 @@ public class QueryStringBuilder {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
final int maxQueryLength = fessConfig.getQueryMaxLengthAsInteger();
- stream(conditions.get(SearchRequestParams.AS_OCCURRENCE)).of(
- stream -> stream.filter(this::isOccurrence).findFirst().ifPresent(q -> queryBuf.insert(0, q + ":")));
-
- stream(conditions.get(SearchRequestParams.AS_Q)).of(
- stream -> stream.filter(q -> StringUtil.isNotBlank(q) && q.length() <= maxQueryLength).forEach(
- q -> queryBuf.append(' ').append(q)));
- stream(conditions.get(SearchRequestParams.AS_EPQ)).of(
- stream -> stream.filter(q -> StringUtil.isNotBlank(q) && q.length() <= maxQueryLength).forEach(
- q -> queryBuf.append(" \"").append(escape(q, "\"")).append('"')));
- stream(conditions.get(SearchRequestParams.AS_OQ)).of(
- stream -> stream.filter(q -> StringUtil.isNotBlank(q) && q.length() <= maxQueryLength).forEach(
- oq -> split(oq, " ").get(
- s -> s.filter(StringUtil::isNotBlank).reduce((q1, q2) -> escape(q1, "(", ")") + OR + escape(q2, "(", ")")))
- .ifPresent(q -> {
- appendQuery(queryBuf, q);
- })));
- stream(conditions.get(SearchRequestParams.AS_NQ)).of(
- stream -> stream.filter(q -> StringUtil.isNotBlank(q) && q.length() <= maxQueryLength).forEach(
- eq -> {
- final String nq =
- split(eq, " ").get(
- s -> s.filter(StringUtil::isNotBlank).map(q -> "NOT " + q).collect(Collectors.joining(" ")));
- queryBuf.append(' ').append(nq);
- }));
- stream(conditions.get(SearchRequestParams.AS_FILETYPE)).of(
- stream -> stream.filter(q -> StringUtil.isNotBlank(q) && q.length() <= maxQueryLength).forEach(
- q -> queryBuf.append(" filetype:\"").append(q.trim()).append('"')));
- stream(conditions.get(SearchRequestParams.AS_SITESEARCH)).of(
- stream -> stream.filter(q -> StringUtil.isNotBlank(q) && q.length() <= maxQueryLength).forEach(
- q -> queryBuf.append(" site:").append(q.trim())));
- stream(conditions.get(SearchRequestParams.AS_TIMESTAMP)).of(
- stream -> stream.filter(q -> StringUtil.isNotBlank(q) && q.length() <= maxQueryLength).forEach(
- q -> queryBuf.append(" timestamp:").append(q.trim())));
+ stream(conditions.get(SearchRequestParams.AS_OCCURRENCE))
+ .of(stream -> stream.filter(this::isOccurrence).findFirst().ifPresent(q -> queryBuf.insert(0, q + ":")));
+
+ stream(conditions.get(SearchRequestParams.AS_Q)).of(stream -> stream
+ .filter(q -> StringUtil.isNotBlank(q) && q.length() <= maxQueryLength).forEach(q -> queryBuf.append(' ').append(q)));
+ stream(conditions.get(SearchRequestParams.AS_EPQ))
+ .of(stream -> stream.filter(q -> StringUtil.isNotBlank(q) && q.length() <= maxQueryLength)
+ .forEach(q -> queryBuf.append(" \"").append(escape(q, "\"")).append('"')));
+ stream(conditions.get(SearchRequestParams.AS_OQ)).of(stream -> stream
+ .filter(q -> StringUtil.isNotBlank(q) && q.length() <= maxQueryLength)
+ .forEach(oq -> split(oq, " ")
+ .get(s -> s.filter(StringUtil::isNotBlank).reduce((q1, q2) -> escape(q1, "(", ")") + OR + escape(q2, "(", ")")))
+ .ifPresent(q -> {
+ appendQuery(queryBuf, q);
+ })));
+ stream(conditions.get(SearchRequestParams.AS_NQ))
+ .of(stream -> stream.filter(q -> StringUtil.isNotBlank(q) && q.length() <= maxQueryLength).forEach(eq -> {
+ final String nq =
+ split(eq, " ").get(s -> s.filter(StringUtil::isNotBlank).map(q -> "NOT " + q).collect(Collectors.joining(" ")));
+ queryBuf.append(' ').append(nq);
+ }));
+ stream(conditions.get(SearchRequestParams.AS_FILETYPE))
+ .of(stream -> stream.filter(q -> StringUtil.isNotBlank(q) && q.length() <= maxQueryLength)
+ .forEach(q -> queryBuf.append(" filetype:\"").append(q.trim()).append('"')));
+ stream(conditions.get(SearchRequestParams.AS_SITESEARCH))
+ .of(stream -> stream.filter(q -> StringUtil.isNotBlank(q) && q.length() <= maxQueryLength)
+ .forEach(q -> queryBuf.append(" site:").append(q.trim())));
+ stream(conditions.get(SearchRequestParams.AS_TIMESTAMP))
+ .of(stream -> stream.filter(q -> StringUtil.isNotBlank(q) && q.length() <= maxQueryLength)
+ .forEach(q -> queryBuf.append(" timestamp:").append(q.trim())));
}
protected boolean isOccurrence(final String value) {
diff --git a/src/main/java/org/codelibs/fess/util/UpgradeUtil.java b/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
index c4414f589..3ad523fb0 100644
--- a/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
+++ b/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
@@ -48,7 +48,8 @@ public final class UpgradeUtil {
final String filePath = indexConfigPath + "/" + indexName + "/" + path;
try {
final String source = FileUtil.readUTF8(filePath);
- try (CurlResponse response = ComponentUtil.getCurlHelper().post("/_configsync/file").param("path", path).body(source).execute()) {
+ try (CurlResponse response =
+ ComponentUtil.getCurlHelper().post("/_configsync/file").param("path", path).body(source).execute()) {
if (response.getHttpStatusCode() == 200) {
logger.info("Register {} to {}", path, indexName);
return true;
@@ -70,9 +71,8 @@ public final class UpgradeUtil {
final File aliasConfigFile = org.codelibs.core.io.ResourceUtil.getResourceAsFile(aliasConfigPath);
if (aliasConfigFile.exists()) {
final String source = FileUtil.readUTF8(aliasConfigFile);
- final AcknowledgedResponse response =
- indicesClient.prepareAliases().addAlias(indexName, aliasName, source).execute()
- .actionGet(fessConfig.getIndexIndicesTimeout());
+ final AcknowledgedResponse response = indicesClient.prepareAliases().addAlias(indexName, aliasName, source).execute()
+ .actionGet(fessConfig.getIndexIndicesTimeout());
if (response.isAcknowledged()) {
logger.info("Created {} alias for {}", aliasName, indexName);
return true;
@@ -103,9 +103,8 @@ public final class UpgradeUtil {
logger.warn(mappingFile + " is not found.", e);
}
try {
- final AcknowledgedResponse putMappingResponse =
- indicesClient.preparePutMapping(index).setSource(source, XContentType.JSON).execute()
- .actionGet(fessConfig.getIndexIndicesTimeout());
+ final AcknowledgedResponse putMappingResponse = indicesClient.preparePutMapping(index).setSource(source, XContentType.JSON)
+ .execute().actionGet(fessConfig.getIndexIndicesTimeout());
if (putMappingResponse.isAcknowledged()) {
logger.info("Created {}/{} mapping.", index, type);
return true;
@@ -120,8 +119,8 @@ public final class UpgradeUtil {
return false;
}
- public static boolean addFieldMapping(final IndicesAdminClient indicesClient, final String index, final String type,
- final String field, final String source) {
+ public static boolean addFieldMapping(final IndicesAdminClient indicesClient, final String index, final String type, final String field,
+ final String source) {
final GetFieldMappingsResponse gfmResponse =
indicesClient.prepareGetFieldMappings(index).addTypes(type).setFields(field).execute().actionGet();
final FieldMappingMetadata fieldMappings = gfmResponse.fieldMappings(index, type, field);
@@ -176,9 +175,8 @@ public final class UpgradeUtil {
final boolean expandWildcardsClosed) {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
try {
- final IndicesExistsResponse response =
- indicesClient.prepareExists(index).setExpandWildcardsClosed(expandWildcardsClosed)
- .setExpandWildcardsOpen(expandWildcardsOpen).execute().actionGet(fessConfig.getIndexSearchTimeout());
+ final IndicesExistsResponse response = indicesClient.prepareExists(index).setExpandWildcardsClosed(expandWildcardsClosed)
+ .setExpandWildcardsOpen(expandWildcardsOpen).execute().actionGet(fessConfig.getIndexSearchTimeout());
return response.isExists();
} catch (final Exception e) {
// ignore
@@ -186,7 +184,8 @@ public final class UpgradeUtil {
return false;
}
- public static void deleteIndex(final IndicesAdminClient indicesClient, final String index, final Consumer<AcknowledgedResponse> comsumer) {
+ public static void deleteIndex(final IndicesAdminClient indicesClient, final String index,
+ final Consumer<AcknowledgedResponse> comsumer) {
indicesClient.prepareDelete(index).execute(new ActionListener<AcknowledgedResponse>() {
@Override
diff --git a/src/test/java/org/codelibs/fess/crawler/transformer/FessXpathTransformerTest.java b/src/test/java/org/codelibs/fess/crawler/transformer/FessXpathTransformerTest.java
index 3f72f5d6b..e938beaec 100644
--- a/src/test/java/org/codelibs/fess/crawler/transformer/FessXpathTransformerTest.java
+++ b/src/test/java/org/codelibs/fess/crawler/transformer/FessXpathTransformerTest.java
@@ -719,8 +719,7 @@ public class FessXpathTransformerTest extends UnitFessTestCase {
value = transformer.getCanonicalUrl(responseData, document);
assertEquals("http://example.com/", value);
- data =
- "<html><head><link rel=\"canonical\" href=\"http://example1.com/\"><link rel=\"canonical\" href=\"http://example2.com/\"></head><body>aaa</body></html>";
+ data = "<html><head><link rel=\"canonical\" href=\"http://example1.com/\"><link rel=\"canonical\" href=\"http://example2.com/\"></head><body>aaa</body></html>";
document = getDocument(data);
value = transformer.getCanonicalUrl(responseData, document);
assertEquals("http://example1.com/", value);
diff --git a/src/test/java/org/codelibs/fess/helper/DocumentHelperTest.java b/src/test/java/org/codelibs/fess/helper/DocumentHelperTest.java
index 3994d3a3c..38d52dd6f 100644
--- a/src/test/java/org/codelibs/fess/helper/DocumentHelperTest.java
+++ b/src/test/java/org/codelibs/fess/helper/DocumentHelperTest.java
@@ -133,8 +133,7 @@ public class DocumentHelperTest extends UnitFessTestCase {
hash = "0001010100100101001001010100010100101010010010100100101011000100";
value = "$H4sIAAAAAAAAADMwMDAEQwhC0EAKxscqDZE3AABZOHx2QAAAAA";
assertEquals(value, documentHelper.encodeSimilarDocHash(hash));
- hash =
- "00100101010001010100100101001001010100010100010101010010010101010010101100010101001000010101001001010001000001010010101001001010";
+ hash = "00100101010001010100100101001001010100010100010101010010010101010010101100010101001000010101001001010001000001010010101001001010";
value = "$H4sIAAAAAAAAADMwMDQAIhCE01ARdBkYD1kGxkDVjWESRBBJPVwKAHL5QrqAAAAA";
assertEquals(value, documentHelper.encodeSimilarDocHash(hash));
@@ -160,8 +159,7 @@ public class DocumentHelperTest extends UnitFessTestCase {
hash = "0001010100100101001001010100010100101010010010100100101011000100";
value = "$H4sIAAAAAAAAADMwMDAEQwhC0EAKxscqDZE3AABZOHx2QAAAAA";
assertEquals(hash, documentHelper.decodeSimilarDocHash(value));
- hash =
- "00100101010001010100100101001001010100010100010101010010010101010010101100010101001000010101001001010001000001010010101001001010";
+ hash = "00100101010001010100100101001001010100010100010101010010010101010010101100010101001000010101001001010001000001010010101001001010";
value = "$H4sIAAAAAAAAADMwMDQAIhCE01ARdBkYD1kGxkDVjWESRBBJPVwKAHL5QrqAAAAA";
assertEquals(hash, documentHelper.decodeSimilarDocHash(value));
diff --git a/src/test/java/org/codelibs/fess/helper/PluginHelperTest.java b/src/test/java/org/codelibs/fess/helper/PluginHelperTest.java
index ccdd62143..20005cf4d 100644
--- a/src/test/java/org/codelibs/fess/helper/PluginHelperTest.java
+++ b/src/test/java/org/codelibs/fess/helper/PluginHelperTest.java
@@ -82,7 +82,8 @@ public class PluginHelperTest extends UnitFessTestCase {
assertEquals(1, list.size());
assertEquals("fess-ds-atlassian", list.get(0).getName());
assertEquals("12.2.0-20180814.210714-10", list.get(0).getVersion());
- assertEquals("plugin/repo2/fess-ds-atlassian/12.2.0-SNAPSHOT/fess-ds-atlassian-12.2.0-20180814.210714-10.jar", list.get(0).getUrl());
+ assertEquals("plugin/repo2/fess-ds-atlassian/12.2.0-SNAPSHOT/fess-ds-atlassian-12.2.0-20180814.210714-10.jar",
+ list.get(0).getUrl());
}
public void test_getArtifactFromFileName1() {
diff --git a/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java b/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java
index 195fc3bd2..d3f96f35b 100644
--- a/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java
+++ b/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java
@@ -69,14 +69,17 @@ public class QueryHelperTest extends UnitFessTestCase {
assertQuery(functionScoreQuery(simpleQuery("QUERY", titleBoost, contentBoost)), buildQuery("QUERY "));
assertQuery(
- functionScoreQuery(andQuery(simpleQuery("QUERY1", titleBoost, contentBoost),
- simpleQuery("QUERY2", titleBoost, contentBoost))), buildQuery("QUERY1 QUERY2"));
+ functionScoreQuery(
+ andQuery(simpleQuery("QUERY1", titleBoost, contentBoost), simpleQuery("QUERY2", titleBoost, contentBoost))),
+ buildQuery("QUERY1 QUERY2"));
assertQuery(
- functionScoreQuery(andQuery(simpleQuery("QUERY1", titleBoost, contentBoost),
- simpleQuery("QUERY2", titleBoost, contentBoost))), buildQuery("QUERY1 AND QUERY2"));
+ functionScoreQuery(
+ andQuery(simpleQuery("QUERY1", titleBoost, contentBoost), simpleQuery("QUERY2", titleBoost, contentBoost))),
+ buildQuery("QUERY1 AND QUERY2"));
assertQuery(
- functionScoreQuery(orQuery(simpleQuery("QUERY1", titleBoost, contentBoost), simpleQuery("QUERY2", titleBoost, contentBoost))),
+ functionScoreQuery(
+ orQuery(simpleQuery("QUERY1", titleBoost, contentBoost), simpleQuery("QUERY2", titleBoost, contentBoost))),
buildQuery("QUERY1 OR QUERY2"));
assertQueryBuilder("test", "", MatchPhraseQueryBuilder.class);
diff --git a/src/test/java/org/codelibs/fess/it/CrawlTestBase.java b/src/test/java/org/codelibs/fess/it/CrawlTestBase.java
index 9b9b0392d..58ce7142f 100644
--- a/src/test/java/org/codelibs/fess/it/CrawlTestBase.java
+++ b/src/test/java/org/codelibs/fess/it/CrawlTestBase.java
@@ -181,9 +181,8 @@ public class CrawlTestBase extends ITBase {
protected static void deleteDocuments(final String queryString) {
List<String> docIds = new ArrayList<>();
- Response response =
- given().contentType("application/json").param("scroll", "1m").param("q", queryString)
- .get(getEsUrl() + "/" + DOC_INDEX_NAME + "/" + DOC_TYPE_NAME + "/_search");
+ Response response = given().contentType("application/json").param("scroll", "1m").param("q", queryString)
+ .get(getEsUrl() + "/" + DOC_INDEX_NAME + "/" + DOC_TYPE_NAME + "/_search");
JsonPath jsonPath = JsonPath.from(response.asString());
String scrollId = jsonPath.getString("_scroll_id");
while (true) {
diff --git a/src/test/java/org/codelibs/fess/it/CrudTestBase.java b/src/test/java/org/codelibs/fess/it/CrudTestBase.java
index 04ff11229..52c3661c3 100644
--- a/src/test/java/org/codelibs/fess/it/CrudTestBase.java
+++ b/src/test/java/org/codelibs/fess/it/CrudTestBase.java
@@ -104,8 +104,8 @@ public abstract class CrudTestBase extends ITBase {
// Test: create setting api.
for (int i = 0; i < NUM; i++) {
final Map<String, Object> requestBody = createTestParam(i);
- checkPutMethod(requestBody, getItemEndpointSuffix()).then().body("response.created", equalTo(true))
- .body("response.status", equalTo(0));
+ checkPutMethod(requestBody, getItemEndpointSuffix()).then().body("response.created", equalTo(true)).body("response.status",
+ equalTo(0));
//logger.info("create {}{}", i, checkPutMethod(requestBody, getItemEndpointSuffix()).asString()); // for debugging
refresh();
diff --git a/src/test/java/org/codelibs/fess/it/ITBase.java b/src/test/java/org/codelibs/fess/it/ITBase.java
index 0a1b833d9..fc60e0989 100644
--- a/src/test/java/org/codelibs/fess/it/ITBase.java
+++ b/src/test/java/org/codelibs/fess/it/ITBase.java
@@ -44,11 +44,10 @@ public class ITBase {
return testToken;
}
- given().contentType("application/json")
- .body("{\"index\":{\"_index\":\".fess_config.access_token\",\"_id\":\""
- + DEFAULT_TEST_TOKEN_ID
- + "\"}}\n{\"updatedTime\":1490250145200,\"updatedBy\":\"admin\",\"createdBy\":\"admin\",\"permissions\":[\"Radmin-api\",\"Rguest\"],\"name\":\"Admin API\",\"createdTime\":1490250145200,\"token\":\""
- + DEFAULT_TEST_TOKEN + "\"}\n").when().post(getEsUrl() + "/_bulk");
+ given().contentType("application/json").body("{\"index\":{\"_index\":\".fess_config.access_token\",\"_id\":\""
+ + DEFAULT_TEST_TOKEN_ID
+ + "\"}}\n{\"updatedTime\":1490250145200,\"updatedBy\":\"admin\",\"createdBy\":\"admin\",\"permissions\":[\"Radmin-api\",\"Rguest\"],\"name\":\"Admin API\",\"createdTime\":1490250145200,\"token\":\""
+ + DEFAULT_TEST_TOKEN + "\"}\n").when().post(getEsUrl() + "/_bulk");
given().contentType("application/json").when().post(getEsUrl() + "/_refresh");
logger.info("Created Token: {}", DEFAULT_TEST_TOKEN);
return DEFAULT_TEST_TOKEN;
diff --git a/src/test/java/org/codelibs/fess/it/admin/PluginTests.java b/src/test/java/org/codelibs/fess/it/admin/PluginTests.java
index 509bc1aef..f08e0b0b7 100644
--- a/src/test/java/org/codelibs/fess/it/admin/PluginTests.java
+++ b/src/test/java/org/codelibs/fess/it/admin/PluginTests.java
@@ -141,12 +141,10 @@ public class PluginTests extends CrudTestBase {
boolean done = false;
for (int i = 0; i < 60; i++) {
- final List<Map<String, Object>> installed =
- checkGetMethod(Collections.emptyMap(), getInstalledEndpointSuffix() + "/").body().jsonPath()
- .get("response.plugins");
- boolean exists =
- installed.stream().map(this::getArtifactFromMap)
- .anyMatch(a -> a.getName().equals(target.getName()) && a.getVersion().equals(target.getVersion()));
+ final List<Map<String, Object>> installed = checkGetMethod(Collections.emptyMap(), getInstalledEndpointSuffix() + "/")
+ .body().jsonPath().get("response.plugins");
+ boolean exists = installed.stream().map(this::getArtifactFromMap)
+ .anyMatch(a -> a.getName().equals(target.getName()) && a.getVersion().equals(target.getVersion()));
if (!exists) {
Thread.sleep(500);
continue;
@@ -163,12 +161,10 @@ public class PluginTests extends CrudTestBase {
boolean done = false;
for (int i = 0; i < 60; i++) {
- final List<Map<String, Object>> installed =
- checkGetMethod(Collections.emptyMap(), getInstalledEndpointSuffix() + "/").body().jsonPath()
- .get("response.plugins");
- boolean exists =
- installed.stream().map(this::getArtifactFromMap)
- .anyMatch(a -> a.getName().equals(target.getName()) && a.getVersion().equals(target.getVersion()));
+ final List<Map<String, Object>> installed = checkGetMethod(Collections.emptyMap(), getInstalledEndpointSuffix() + "/")
+ .body().jsonPath().get("response.plugins");
+ boolean exists = installed.stream().map(this::getArtifactFromMap)
+ .anyMatch(a -> a.getName().equals(target.getName()) && a.getVersion().equals(target.getVersion()));
if (exists) {
Thread.sleep(500);
continue;
diff --git a/src/test/java/org/codelibs/fess/it/search/SearchApiTests.java b/src/test/java/org/codelibs/fess/it/search/SearchApiTests.java
index 5ee8375d0..8d5c988cf 100644
--- a/src/test/java/org/codelibs/fess/it/search/SearchApiTests.java
+++ b/src/test/java/org/codelibs/fess/it/search/SearchApiTests.java
@@ -153,10 +153,8 @@ public class SearchApiTests extends CrawlTestBase {
List<Map<String, Object>> docs = JsonPath.from(response).getList("response.result");
for (Map<String, Object> doc : docs) {
for (String keyword : query.split(" ")) {
- assertTrue(
- doc.entrySet().stream()
- .anyMatch(entry -> entry.getValue().toString().toLowerCase().contains(keyword.toLowerCase())),
- doc.toString());
+ assertTrue(doc.entrySet().stream()
+ .anyMatch(entry -> entry.getValue().toString().toLowerCase().contains(keyword.toLowerCase())), doc.toString());
}
}
}
@@ -175,10 +173,8 @@ public class SearchApiTests extends CrawlTestBase {
if (keyword.equals("AND")) {
continue;
}
- assertTrue(
- doc.entrySet().stream()
- .anyMatch(entry -> entry.getValue().toString().toLowerCase().contains(keyword.toLowerCase())),
- doc.toString());
+ assertTrue(doc.entrySet().stream()
+ .anyMatch(entry -> entry.getValue().toString().toLowerCase().contains(keyword.toLowerCase())), doc.toString());
}
}
}
@@ -225,14 +221,10 @@ public class SearchApiTests extends CrawlTestBase {
List<Map<String, Object>> docs = JsonPath.from(response).getList("response.result");
for (Map<String, Object> doc : docs) {
String[] keywords = query.split(" ");
- assertTrue(
- doc.entrySet().stream()
- .anyMatch(entry -> entry.getValue().toString().toLowerCase().contains(keywords[0].toLowerCase())),
- doc.toString());
- assertFalse(
- doc.entrySet().stream()
- .anyMatch(entry -> entry.getValue().toString().toLowerCase().contains(keywords[2].toLowerCase())),
- doc.toString());
+ assertTrue(doc.entrySet().stream()
+ .anyMatch(entry -> entry.getValue().toString().toLowerCase().contains(keywords[0].toLowerCase())), doc.toString());
+ assertFalse(doc.entrySet().stream()
+ .anyMatch(entry -> entry.getValue().toString().toLowerCase().contains(keywords[2].toLowerCase())), doc.toString());
}
}
diff --git a/src/test/java/org/codelibs/fess/mylasta/FessActionDefTest.java b/src/test/java/org/codelibs/fess/mylasta/FessActionDefTest.java
index 51f5794aa..a6613f065 100644
--- a/src/test/java/org/codelibs/fess/mylasta/FessActionDefTest.java
+++ b/src/test/java/org/codelibs/fess/mylasta/FessActionDefTest.java
@@ -49,7 +49,7 @@ public class FessActionDefTest extends UnitFessTestCase {
final String webPackageKeyword = getWebPackageKeyword();
if (!clazz.getName().contains(webPackageKeyword) ||
// exclude app.web.api.admin packages
- clazz.getName().contains(".app.web.api.admin.")) {
+ clazz.getName().contains(".app.web.api.admin.")) {
return;
}
check(srcFile, clazz, webPackageKeyword);
diff --git a/src/test/java/org/codelibs/fess/util/JvmUtilTest.java b/src/test/java/org/codelibs/fess/util/JvmUtilTest.java
index 43811f40e..bde46dc7f 100644
--- a/src/test/java/org/codelibs/fess/util/JvmUtilTest.java
+++ b/src/test/java/org/codelibs/fess/util/JvmUtilTest.java
@@ -40,15 +40,15 @@ public class JvmUtilTest extends UnitFessTestCase {
public void test_filterJvmOptions() {
final String[] args = new String[] { //
"-X111", //
- "8:-X222", //
- "10:-X333", //
- "11:-X444", //
- "8-:-X555", //
- "10-:-X666", //
- "11-:-X777", //
- "12-:-X888", //
- "-X999",//
- };
+ "8:-X222", //
+ "10:-X333", //
+ "11:-X444", //
+ "8-:-X555", //
+ "10-:-X666", //
+ "11-:-X777", //
+ "12-:-X888", //
+ "-X999",//
+ };
System.setProperty("java.version", "1.8.0_171");
String[] values = JvmUtil.filterJvmOptions(args);
--
GitLab