From 90d6af13850c9e58a08ac46dce01287e557248c8 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Sat, 23 Dec 2023 15:18:48 +0900 Subject: [PATCH 01/69] fix #2788 bump up to tomcat 10.1 --- deps.xml | 10 +- pom.xml | 39 ++++--- src/main/java/org/codelibs/fess/FessBoot.java | 11 +- .../org/codelibs/fess/api/BaseApiManager.java | 6 +- .../org/codelibs/fess/api/WebApiManager.java | 8 +- .../fess/api/WebApiManagerFactory.java | 2 +- .../org/codelibs/fess/api/WebApiRequest.java | 4 +- .../org/codelibs/fess/api/WebApiResponse.java | 6 +- .../api/engine/SearchEngineApiManager.java | 16 +-- .../fess/api/json/SearchApiManager.java | 12 +-- .../fess/app/job/AllJobScheduler.java | 4 +- .../fess/app/logic/AccessContextLogic.java | 4 +- .../fess/app/service/AccessTokenService.java | 6 +- .../fess/app/service/BadWordService.java | 4 +- .../app/service/BoostDocumentRuleService.java | 4 +- .../fess/app/service/CharMappingService.java | 4 +- .../fess/app/service/CrawlingInfoService.java | 4 +- .../fess/app/service/DataConfigService.java | 4 +- .../app/service/DuplicateHostService.java | 4 +- .../fess/app/service/ElevateWordService.java | 4 +- .../fess/app/service/FailureUrlService.java | 4 +- .../fess/app/service/FavoriteLogService.java | 4 +- .../service/FileAuthenticationService.java | 4 +- .../fess/app/service/FileConfigService.java | 4 +- .../fess/app/service/GroupService.java | 4 +- .../fess/app/service/JobLogService.java | 4 +- .../fess/app/service/KeyMatchService.java | 4 +- .../fess/app/service/KuromojiService.java | 4 +- .../fess/app/service/LabelTypeService.java | 4 +- .../fess/app/service/PathMappingService.java | 4 +- .../fess/app/service/ProtwordsService.java | 4 +- .../app/service/RelatedContentService.java | 4 +- .../fess/app/service/RelatedQueryService.java | 4 +- .../app/service/RequestHeaderService.java | 4 +- .../fess/app/service/RoleService.java | 4 +- .../fess/app/service/RoleTypeService.java | 4 +- .../fess/app/service/ScheduledJobService.java | 4 +- .../fess/app/service/SearchLogService.java | 4 +- .../app/service/StemmerOverrideService.java | 4 +- .../fess/app/service/StopwordsService.java | 4 +- .../fess/app/service/SynonymService.java | 4 +- .../fess/app/service/UserInfoService.java | 4 +- .../fess/app/service/UserService.java | 4 +- .../app/service/WebAuthenticationService.java | 4 +- .../fess/app/service/WebConfigService.java | 4 +- .../accesstoken/AdminAccesstokenAction.java | 4 +- .../app/web/admin/accesstoken/CreateForm.java | 6 +- .../app/web/admin/accesstoken/EditForm.java | 4 +- .../web/admin/backup/AdminBackupAction.java | 4 +- .../web/admin/badword/AdminBadwordAction.java | 4 +- .../app/web/admin/badword/CreateForm.java | 6 +- .../fess/app/web/admin/badword/EditForm.java | 4 +- .../admin/boostdoc/AdminBoostdocAction.java | 4 +- .../app/web/admin/boostdoc/CreateForm.java | 8 +- .../fess/app/web/admin/boostdoc/EditForm.java | 4 +- .../crawlinginfo/AdminCrawlinginfoAction.java | 4 +- .../app/web/admin/crawlinginfo/EditForm.java | 4 +- .../admin/dashboard/AdminDashboardAction.java | 4 +- .../dataconfig/AdminDataconfigAction.java | 4 +- .../app/web/admin/dataconfig/CreateForm.java | 8 +- .../app/web/admin/dataconfig/EditForm.java | 4 +- .../fess/app/web/admin/design/UploadForm.java | 4 +- .../app/web/admin/dict/AdminDictAction.java | 4 +- .../kuromoji/AdminDictKuromojiAction.java | 4 +- .../web/admin/dict/kuromoji/CreateForm.java | 4 +- .../dict/mapping/AdminDictMappingAction.java | 4 +- .../web/admin/dict/mapping/CreateForm.java | 4 +- .../protwords/AdminDictProtwordsAction.java | 4 +- .../web/admin/dict/protwords/CreateForm.java | 4 +- .../AdminDictStemmeroverrideAction.java | 4 +- .../dict/stemmeroverride/CreateForm.java | 4 +- .../stopwords/AdminDictStopwordsAction.java | 4 +- .../web/admin/dict/stopwords/CreateForm.java | 4 +- .../dict/synonym/AdminDictSynonymAction.java | 4 +- .../web/admin/dict/synonym/CreateForm.java | 4 +- .../AdminDuplicatehostAction.java | 4 +- .../web/admin/duplicatehost/CreateForm.java | 8 +- .../app/web/admin/duplicatehost/EditForm.java | 4 +- .../elevateword/AdminElevatewordAction.java | 4 +- .../app/web/admin/elevateword/CreateForm.java | 4 +- .../app/web/admin/elevateword/EditForm.java | 4 +- .../failureurl/AdminFailureurlAction.java | 4 +- .../app/web/admin/failureurl/EditForm.java | 4 +- .../admin/fileauth/AdminFileauthAction.java | 4 +- .../app/web/admin/fileauth/CreateForm.java | 8 +- .../fess/app/web/admin/fileauth/EditForm.java | 4 +- .../fileconfig/AdminFileconfigAction.java | 4 +- .../app/web/admin/fileconfig/CreateForm.java | 8 +- .../app/web/admin/fileconfig/EditForm.java | 4 +- .../web/admin/general/AdminGeneralAction.java | 4 +- .../fess/app/web/admin/general/EditForm.java | 8 +- .../fess/app/web/admin/general/MailForm.java | 4 +- .../app/web/admin/group/AdminGroupAction.java | 4 +- .../fess/app/web/admin/group/CreateForm.java | 4 +- .../fess/app/web/admin/group/EditForm.java | 4 +- .../web/admin/joblog/AdminJoblogAction.java | 4 +- .../admin/keymatch/AdminKeymatchAction.java | 4 +- .../app/web/admin/keymatch/CreateForm.java | 8 +- .../fess/app/web/admin/keymatch/EditForm.java | 4 +- .../admin/labeltype/AdminLabeltypeAction.java | 4 +- .../app/web/admin/labeltype/CreateForm.java | 10 +- .../app/web/admin/labeltype/EditForm.java | 4 +- .../app/web/admin/maintenance/ActionForm.java | 4 +- .../maintenance/AdminMaintenanceAction.java | 4 +- .../web/admin/pathmap/AdminPathmapAction.java | 4 +- .../app/web/admin/pathmap/CreateForm.java | 8 +- .../fess/app/web/admin/pathmap/EditForm.java | 4 +- .../fess/app/web/admin/plugin/DeleteForm.java | 4 +- .../app/web/admin/plugin/InstallForm.java | 4 +- .../AdminRelatedcontentAction.java | 4 +- .../web/admin/relatedcontent/CreateForm.java | 8 +- .../web/admin/relatedcontent/EditForm.java | 4 +- .../relatedquery/AdminRelatedqueryAction.java | 4 +- .../web/admin/relatedquery/CreateForm.java | 4 +- .../app/web/admin/relatedquery/EditForm.java | 4 +- .../admin/reqheader/AdminReqheaderAction.java | 4 +- .../app/web/admin/reqheader/CreateForm.java | 4 +- .../app/web/admin/reqheader/EditForm.java | 4 +- .../app/web/admin/role/AdminRoleAction.java | 4 +- .../fess/app/web/admin/role/CreateForm.java | 4 +- .../fess/app/web/admin/role/EditForm.java | 4 +- .../admin/scheduler/AdminSchedulerAction.java | 4 +- .../app/web/admin/scheduler/CreateForm.java | 8 +- .../app/web/admin/scheduler/EditForm.java | 4 +- .../searchlist/AdminSearchlistAction.java | 6 +- .../app/web/admin/searchlist/DeleteForm.java | 4 +- .../app/web/admin/searchlist/ListForm.java | 4 +- .../admin/searchlog/AdminSearchlogAction.java | 4 +- .../app/web/admin/searchlog/EditForm.java | 4 +- .../fess/app/web/admin/storage/ItemForm.java | 4 +- .../fess/app/web/admin/storage/TagForm.java | 4 +- .../web/admin/suggest/AdminSuggestAction.java | 4 +- .../systeminfo/AdminSysteminfoAction.java | 4 +- .../web/admin/upgrade/AdminUpgradeAction.java | 4 +- .../app/web/admin/user/AdminUserAction.java | 4 +- .../fess/app/web/admin/user/CreateForm.java | 4 +- .../fess/app/web/admin/user/EditForm.java | 4 +- .../web/admin/webauth/AdminWebauthAction.java | 4 +- .../app/web/admin/webauth/CreateForm.java | 8 +- .../fess/app/web/admin/webauth/EditForm.java | 4 +- .../admin/webconfig/AdminWebconfigAction.java | 4 +- .../app/web/admin/webconfig/CreateForm.java | 8 +- .../app/web/admin/webconfig/EditForm.java | 4 +- .../web/admin/wizard/AdminWizardAction.java | 4 +- .../web/admin/wizard/CrawlingConfigForm.java | 8 +- .../codelibs/fess/app/web/api/ApiResult.java | 4 +- .../fess/app/web/api/FessApiAction.java | 6 +- .../admin/badword/ApiAdminBadwordAction.java | 4 +- .../boostdoc/ApiAdminBoostdocAction.java | 4 +- .../ApiAdminCrawlinginfoAction.java | 4 +- .../dataconfig/ApiAdminDataconfigAction.java | 4 +- .../api/admin/dict/ApiAdminDictAction.java | 4 +- .../kuromoji/ApiAdminDictKuromojiAction.java | 4 +- .../mapping/ApiAdminDictMappingAction.java | 4 +- .../ApiAdminDictProtwordsAction.java | 4 +- .../ApiAdminDictStemmeroverrideAction.java | 4 +- .../ApiAdminDictStopwordsAction.java | 4 +- .../synonym/ApiAdminDictSynonymAction.java | 4 +- .../ApiAdminDuplicatehostAction.java | 4 +- .../ApiAdminElevatewordAction.java | 4 +- .../failureurl/ApiAdminFailureurlAction.java | 4 +- .../fileauth/ApiAdminFileauthAction.java | 4 +- .../fileconfig/ApiAdminFileconfigAction.java | 4 +- .../admin/general/ApiAdminGeneralAction.java | 4 +- .../api/admin/group/ApiAdminGroupAction.java | 4 +- .../admin/joblog/ApiAdminJoblogAction.java | 4 +- .../keymatch/ApiAdminKeymatchAction.java | 4 +- .../labeltype/ApiAdminLabeltypeAction.java | 4 +- .../admin/pathmap/ApiAdminPathmapAction.java | 4 +- .../app/web/api/admin/plugin/InstallBody.java | 4 +- .../ApiAdminRelatedcontentAction.java | 4 +- .../ApiAdminRelatedqueryAction.java | 4 +- .../reqheader/ApiAdminReqheaderAction.java | 4 +- .../api/admin/role/ApiAdminRoleAction.java | 4 +- .../scheduler/ApiAdminSchedulerAction.java | 4 +- .../searchlist/ApiAdminSearchlistAction.java | 4 +- .../admin/suggest/ApiAdminSuggestAction.java | 4 +- .../api/admin/user/ApiAdminUserAction.java | 4 +- .../admin/webauth/ApiAdminWebauthAction.java | 4 +- .../webconfig/ApiAdminWebconfigAction.java | 4 +- .../fess/app/web/base/FessAdminAction.java | 6 +- .../fess/app/web/base/FessBaseAction.java | 4 +- .../fess/app/web/base/FessSearchAction.java | 8 +- .../fess/app/web/base/SearchForm.java | 4 +- .../app/web/base/login/FessLoginAssist.java | 4 +- .../app/web/base/login/SamlCredential.java | 3 +- .../fess/app/web/cache/CacheForm.java | 4 +- .../codelibs/fess/app/web/go/GoAction.java | 4 +- .../org/codelibs/fess/app/web/go/GoForm.java | 4 +- .../fess/app/web/login/LoginAction.java | 6 +- .../fess/app/web/login/LoginForm.java | 2 +- .../fess/app/web/login/PasswordForm.java | 2 +- .../fess/app/web/profile/ProfileAction.java | 4 +- .../fess/app/web/profile/ProfileForm.java | 2 +- .../fess/app/web/search/SearchAction.java | 6 +- .../app/web/thumbnail/ThumbnailAction.java | 6 +- .../fess/app/web/thumbnail/ThumbnailForm.java | 4 +- .../org/codelibs/fess/cors/CorsHandler.java | 4 +- .../fess/cors/DefaultCorsHandler.java | 10 +- .../processor/FessResponseProcessor.java | 4 +- .../transformer/FessFileTransformer.java | 4 +- .../transformer/FessStandardTransformer.java | 4 +- .../transformer/FessXpathTransformer.java | 3 +- .../codelibs/fess/dict/DictionaryCreator.java | 4 +- .../codelibs/fess/dict/DictionaryManager.java | 4 +- .../fess/dict/kuromoji/KuromojiCreator.java | 4 +- .../fess/dict/mapping/CharMappingCreator.java | 4 +- .../fess/dict/protwords/ProtwordsCreator.java | 4 +- .../StemmerOverrideCreator.java | 4 +- .../fess/dict/stopwords/StopwordsCreator.java | 4 +- .../fess/dict/synonym/SynonymCreator.java | 4 +- .../ds/callback/IndexUpdateCallbackImpl.java | 4 +- .../org/codelibs/fess/entity/FacetInfo.java | 4 +- .../codelibs/fess/entity/FacetQueryView.java | 4 +- .../org/codelibs/fess/entity/GeoInfo.java | 4 +- .../fess/entity/SearchRequestParams.java | 4 +- .../fess/es/client/SearchEngineClient.java | 6 +- .../config/allcommon/EsAbstractBehavior.java | 4 +- .../es/log/allcommon/EsAbstractBehavior.java | 4 +- .../es/user/allcommon/EsAbstractBehavior.java | 4 +- .../exception/ServletRuntimeException.java | 2 +- .../java/org/codelibs/fess/exec/Crawler.java | 4 +- .../codelibs/fess/exec/SuggestCreator.java | 4 +- .../fess/exec/ThumbnailGenerator.java | 4 +- .../org/codelibs/fess/filter/CorsFilter.java | 16 +-- .../codelibs/fess/filter/EncodingFilter.java | 20 ++-- .../codelibs/fess/filter/WebApiFilter.java | 18 ++-- .../fess/helper/AccessTokenHelper.java | 4 +- .../codelibs/fess/helper/ActivityHelper.java | 4 +- .../fess/helper/CrawlerStatsHelper.java | 6 +- .../fess/helper/CrawlingConfigHelper.java | 4 +- .../org/codelibs/fess/helper/CurlHelper.java | 3 +- .../codelibs/fess/helper/DocumentHelper.java | 4 +- .../fess/helper/DuplicateHostHelper.java | 4 +- .../codelibs/fess/helper/FileTypeHelper.java | 4 +- .../codelibs/fess/helper/KeyMatchHelper.java | 4 +- .../codelibs/fess/helper/LabelTypeHelper.java | 4 +- .../codelibs/fess/helper/LanguageHelper.java | 4 +- .../org/codelibs/fess/helper/OsddHelper.java | 4 +- .../fess/helper/PathMappingHelper.java | 4 +- .../fess/helper/PermissionHelper.java | 3 +- .../fess/helper/PopularWordHelper.java | 4 +- .../codelibs/fess/helper/ProcessHelper.java | 4 +- .../org/codelibs/fess/helper/QueryHelper.java | 6 +- .../fess/helper/RelatedContentHelper.java | 4 +- .../fess/helper/RelatedQueryHelper.java | 4 +- .../codelibs/fess/helper/RoleQueryHelper.java | 8 +- .../org/codelibs/fess/helper/SambaHelper.java | 3 +- .../codelibs/fess/helper/SearchHelper.java | 4 +- .../codelibs/fess/helper/SearchLogHelper.java | 4 +- .../codelibs/fess/helper/SuggestHelper.java | 4 +- .../codelibs/fess/helper/SystemHelper.java | 8 +- .../codelibs/fess/helper/UserInfoHelper.java | 8 +- .../org/codelibs/fess/helper/ViewHelper.java | 12 +-- .../codelibs/fess/indexer/IndexUpdater.java | 8 +- .../java/org/codelibs/fess/job/CrawlJob.java | 4 +- .../fess/job/GenerateThumbnailJob.java | 4 +- .../java/org/codelibs/fess/job/PythonJob.java | 4 +- .../org/codelibs/fess/job/SuggestJob.java | 4 +- .../org/codelibs/fess/ldap/LdapManager.java | 3 +- .../direction/FessFwAssistantDirector.java | 4 +- .../sponsor/FessMultipartRequestHandler.java | 101 +++++++++++------- .../codelibs/fess/query/QueryFieldConfig.java | 4 +- .../codelibs/fess/query/QueryProcessor.java | 4 +- .../fess/query/parser/QueryParser.java | 4 +- .../fess/rank/fusion/RankFusionProcessor.java | 10 +- .../fess/sso/aad/AzureAdAuthenticator.java | 8 +- .../sso/oic/OpenIdConnectAuthenticator.java | 8 +- .../fess/sso/saml/SamlAuthenticator.java | 19 ++-- .../fess/sso/spnego/SpnegoAuthenticator.java | 10 +- .../codelibs/fess/taglib/FessFunctions.java | 4 +- .../fess/thumbnail/ThumbnailManager.java | 6 +- .../fess/thumbnail/impl/CommandGenerator.java | 4 +- .../org/codelibs/fess/util/DocumentUtil.java | 4 +- .../org/codelibs/fess/util/ResourceUtil.java | 4 +- .../fess/validation/CronExpression.java | 4 +- .../validation/CronExpressionValidator.java | 6 +- .../codelibs/fess/validation/CustomSize.java | 8 +- .../fess/validation/CustomSizeValidator.java | 6 +- .../org/codelibs/fess/validation/UriType.java | 6 +- .../fess/validation/UriTypeValidator.java | 8 +- src/main/webapp/WEB-INF/fe.tld | 2 +- .../WEB-INF/orig/view/error/redirect.jsp | 8 +- .../webapp/WEB-INF/view/common/common.jsp | 10 +- .../webapp/WEB-INF/view/error/redirect.jsp | 8 +- src/main/webapp/WEB-INF/web.xml | 11 +- .../fess/helper/RoleQueryHelperTest.java | 6 +- 287 files changed, 790 insertions(+), 745 deletions(-) diff --git a/deps.xml b/deps.xml index d90f822453..a6ac5808f8 100644 --- a/deps.xml +++ b/deps.xml @@ -24,13 +24,13 @@ - + - - - - + + + + diff --git a/pom.xml b/pom.xml index cd9daffab9..b2c060c071 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 fess - 14.12.0-SNAPSHOT + 15.0.0-SNAPSHOT war Fess Fess is Full tExt Search System. @@ -30,7 +30,7 @@ org.codelibs.fess fess-parent - 14.12.0-SNAPSHOT + 15.0.0-SNAPSHOT @@ -939,16 +939,31 @@ - javax.servlet - jstl - ${jstl.version} + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + ${jakarta.jstl.api.version} + + + jakarta.el + jakarta.el-api + + + jakarta.servlet + jakarta.servlet-api + + + + + org.glassfish.web + jakarta.servlet.jsp.jstl + ${jakarta.jstl.version} - javax.transaction - javax.transaction-api - ${javax.transaction.api.version} + jakarta.transaction + jakarta.transaction-api + ${jakarta.transaction.api.version} org.glassfish.jersey.core @@ -1314,7 +1329,7 @@ ${okhttp.version} - com.onelogin + org.codelibs java-saml ${java.saml.version} @@ -1339,8 +1354,8 @@ - commons-fileupload - commons-fileupload + org.apache.commons + commons-fileupload2-jakarta ${commons.fileupload.version} @@ -1528,7 +1543,7 @@ org.dbflute.utflute - utflute-lastaflute + utflute-lastaflute-jakarta ${utflute.version} test diff --git a/src/main/java/org/codelibs/fess/FessBoot.java b/src/main/java/org/codelibs/fess/FessBoot.java index 60cbdc6adb..e5dcaad874 100644 --- a/src/main/java/org/codelibs/fess/FessBoot.java +++ b/src/main/java/org/codelibs/fess/FessBoot.java @@ -30,6 +30,7 @@ import org.apache.tomcat.util.http.CookieProcessorBase; import org.apache.tomcat.util.http.Rfc6265CookieProcessor; import org.apache.tomcat.util.net.SSLHostConfig; +import org.apache.tomcat.util.net.SSLHostConfigCertificate; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.tomcat.valve.SuppressErrorReportValve; import org.codelibs.fess.tomcat.webresources.FessWebResourceRoot; @@ -171,12 +172,16 @@ public void setupServerConfigIfNeeds(final BootLogger logger, final Tomcat serve connector.setProperty("SSLEnabled", "true"); final SSLHostConfig sslHostConfig = new SSLHostConfig(); sslHostConfig.setHostName("_default_"); - doSetupServerConfig(logger, props, "certificateKeystoreFile", v -> sslHostConfig.setCertificateKeystoreFile(v)); - doSetupServerConfig(logger, props, "certificateKeystorePassword", v -> sslHostConfig.setCertificateKeystorePassword(v)); - doSetupServerConfig(logger, props, "certificateKeyAlias", v -> sslHostConfig.setCertificateKeyAlias(v)); + final SSLHostConfigCertificate certificate = + new SSLHostConfigCertificate(sslHostConfig, SSLHostConfigCertificate.Type.UNDEFINED); + doSetupServerConfig(logger, props, "certificateKeystoreFile", v -> certificate.setCertificateKeystoreFile(v)); + doSetupServerConfig(logger, props, "certificateKeystorePassword", v -> certificate.setCertificateKeystorePassword(v)); + doSetupServerConfig(logger, props, "certificateKeyAlias", v -> certificate.setCertificateKeyAlias(v)); doSetupServerConfig(logger, props, "sslProtocol", v -> sslHostConfig.setSslProtocol(v)); doSetupServerConfig(logger, props, "enabledProtocols", v -> sslHostConfig.setEnabledProtocols(v.trim().split(","))); + sslHostConfig.addCertificate(certificate); connector.addSslHostConfig(sslHostConfig); + } }); doSetupServerConfig(logger, props, "sameSiteCookies", value -> { diff --git a/src/main/java/org/codelibs/fess/api/BaseApiManager.java b/src/main/java/org/codelibs/fess/api/BaseApiManager.java index 54bf9ee9ec..2b3088173a 100644 --- a/src/main/java/org/codelibs/fess/api/BaseApiManager.java +++ b/src/main/java/org/codelibs/fess/api/BaseApiManager.java @@ -20,14 +20,14 @@ import java.io.PrintWriter; import java.util.Locale; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.codelibs.core.exception.IORuntimeException; import org.codelibs.fess.Constants; import org.lastaflute.web.util.LaRequestUtil; import org.lastaflute.web.util.LaResponseUtil; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + public abstract class BaseApiManager implements WebApiManager { private static final String API_FORMAT_TYPE = "apiFormatType"; diff --git a/src/main/java/org/codelibs/fess/api/WebApiManager.java b/src/main/java/org/codelibs/fess/api/WebApiManager.java index b97f6bc5d9..d61c91e15e 100644 --- a/src/main/java/org/codelibs/fess/api/WebApiManager.java +++ b/src/main/java/org/codelibs/fess/api/WebApiManager.java @@ -17,10 +17,10 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public interface WebApiManager { diff --git a/src/main/java/org/codelibs/fess/api/WebApiManagerFactory.java b/src/main/java/org/codelibs/fess/api/WebApiManagerFactory.java index 8c09ac0fec..e602815a98 100644 --- a/src/main/java/org/codelibs/fess/api/WebApiManagerFactory.java +++ b/src/main/java/org/codelibs/fess/api/WebApiManagerFactory.java @@ -19,7 +19,7 @@ import java.util.Collections; import java.util.List; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public class WebApiManagerFactory { diff --git a/src/main/java/org/codelibs/fess/api/WebApiRequest.java b/src/main/java/org/codelibs/fess/api/WebApiRequest.java index f3099a886f..365c7f62b0 100644 --- a/src/main/java/org/codelibs/fess/api/WebApiRequest.java +++ b/src/main/java/org/codelibs/fess/api/WebApiRequest.java @@ -15,8 +15,8 @@ */ package org.codelibs.fess.api; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; public class WebApiRequest extends HttpServletRequestWrapper { protected String servletPath; diff --git a/src/main/java/org/codelibs/fess/api/WebApiResponse.java b/src/main/java/org/codelibs/fess/api/WebApiResponse.java index 99c8b8b863..9cb761547e 100644 --- a/src/main/java/org/codelibs/fess/api/WebApiResponse.java +++ b/src/main/java/org/codelibs/fess/api/WebApiResponse.java @@ -18,11 +18,11 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; - import org.apache.commons.io.output.ByteArrayOutputStream; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; + public class WebApiResponse extends HttpServletResponseWrapper { public WebApiResponse(final HttpServletResponse response) { diff --git a/src/main/java/org/codelibs/fess/api/engine/SearchEngineApiManager.java b/src/main/java/org/codelibs/fess/api/engine/SearchEngineApiManager.java index bd60bdb5c5..8ff13947d1 100644 --- a/src/main/java/org/codelibs/fess/api/engine/SearchEngineApiManager.java +++ b/src/main/java/org/codelibs/fess/api/engine/SearchEngineApiManager.java @@ -23,14 +23,6 @@ import java.util.Locale; import java.util.UUID; -import javax.annotation.PostConstruct; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.catalina.connector.ClientAbortException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -49,6 +41,14 @@ import org.lastaflute.web.servlet.request.RequestManager; import org.lastaflute.web.servlet.session.SessionManager; +import jakarta.annotation.PostConstruct; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + public class SearchEngineApiManager extends BaseApiManager { private static final String ADMIN_SERVER = "/admin/server_"; diff --git a/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java b/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java index 17e577e78e..e086c8ec41 100644 --- a/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java +++ b/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java @@ -32,12 +32,6 @@ import java.util.UUID; import java.util.function.Supplier; -import javax.annotation.PostConstruct; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.StringEscapeUtils; @@ -83,6 +77,12 @@ import org.lastaflute.web.util.LaResponseUtil; import org.opensearch.script.Script; +import jakarta.annotation.PostConstruct; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + public class SearchApiManager extends BaseApiManager { private static final Logger logger = LogManager.getLogger(SearchApiManager.class); 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 a3d9c82771..a77e86399b 100644 --- a/src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java +++ b/src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java @@ -15,8 +15,6 @@ */ package org.codelibs.fess.app.job; -import javax.annotation.Resource; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -36,6 +34,8 @@ import org.lastaflute.job.LaJobRunner; import org.lastaflute.job.LaJobScheduler; +import jakarta.annotation.Resource; + public class AllJobScheduler implements LaJobScheduler { private static final Logger logger = LogManager.getLogger(AllJobScheduler.class); diff --git a/src/main/java/org/codelibs/fess/app/logic/AccessContextLogic.java b/src/main/java/org/codelibs/fess/app/logic/AccessContextLogic.java index 18a6ee0d62..067bf2cdf5 100644 --- a/src/main/java/org/codelibs/fess/app/logic/AccessContextLogic.java +++ b/src/main/java/org/codelibs/fess/app/logic/AccessContextLogic.java @@ -15,14 +15,14 @@ */ package org.codelibs.fess.app.logic; -import javax.annotation.Resource; - import org.codelibs.fess.mylasta.action.FessUserBean; import org.dbflute.hook.AccessContext; import org.dbflute.optional.OptionalThing; import org.lastaflute.core.time.TimeManager; import org.lastaflute.db.dbflute.accesscontext.AccessContextResource; +import jakarta.annotation.Resource; + public class AccessContextLogic { // =================================================================================== 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 d534996220..d729fd019f 100644 --- a/src/main/java/org/codelibs/fess/app/service/AccessTokenService.java +++ b/src/main/java/org/codelibs/fess/app/service/AccessTokenService.java @@ -21,9 +21,6 @@ import java.util.List; import java.util.Set; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -38,6 +35,9 @@ import org.dbflute.cbean.result.PagingResultBean; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; + public class AccessTokenService { @Resource 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 d04a5841d4..e874dfc9e0 100644 --- a/src/main/java/org/codelibs/fess/app/service/BadWordService.java +++ b/src/main/java/org/codelibs/fess/app/service/BadWordService.java @@ -21,8 +21,6 @@ import java.util.ArrayList; import java.util.List; -import javax.annotation.Resource; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.beans.util.BeanUtil; @@ -43,6 +41,8 @@ import com.orangesignal.csv.CsvReader; import com.orangesignal.csv.CsvWriter; +import jakarta.annotation.Resource; + public class BadWordService { private static final String DELETE_PREFIX = "--"; 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 cfae422660..65c5e2b6a2 100644 --- a/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java +++ b/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java @@ -17,8 +17,6 @@ import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -30,6 +28,8 @@ import org.dbflute.cbean.result.PagingResultBean; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class BoostDocumentRuleService extends FessAppService { @Resource 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 5b833cdf36..312c635df2 100644 --- a/src/main/java/org/codelibs/fess/app/service/CharMappingService.java +++ b/src/main/java/org/codelibs/fess/app/service/CharMappingService.java @@ -18,8 +18,6 @@ import java.util.Collections; import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.CharMappingPager; @@ -30,6 +28,8 @@ import org.codelibs.fess.mylasta.direction.FessConfig; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class CharMappingService { @Resource protected DictionaryManager dictionaryManager; 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 d165b10c5b..e1e893aac5 100644 --- a/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java +++ b/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java @@ -28,8 +28,6 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.CoreLibConstants; @@ -54,6 +52,8 @@ import com.orangesignal.csv.CsvReader; import com.orangesignal.csv.CsvWriter; +import jakarta.annotation.Resource; + public class CrawlingInfoService { private static final Logger logger = LogManager.getLogger(CrawlingInfoService.class); diff --git a/src/main/java/org/codelibs/fess/app/service/DataConfigService.java b/src/main/java/org/codelibs/fess/app/service/DataConfigService.java index e58f1d046d..594aa23ae5 100644 --- a/src/main/java/org/codelibs/fess/app/service/DataConfigService.java +++ b/src/main/java/org/codelibs/fess/app/service/DataConfigService.java @@ -17,8 +17,6 @@ import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -32,6 +30,8 @@ import org.dbflute.cbean.result.PagingResultBean; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class DataConfigService extends FessAppService { @Resource diff --git a/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java b/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java index 6eca80f120..2a8ae5ee83 100644 --- a/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java +++ b/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java @@ -17,8 +17,6 @@ import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -30,6 +28,8 @@ import org.dbflute.cbean.result.PagingResultBean; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class DuplicateHostService extends FessAppService { @Resource 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 16e103d3fd..55a16987b8 100644 --- a/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java +++ b/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java @@ -25,8 +25,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.beans.util.BeanUtil; @@ -52,6 +50,8 @@ import com.orangesignal.csv.CsvReader; import com.orangesignal.csv.CsvWriter; +import jakarta.annotation.Resource; + public class ElevateWordService { private static final Logger logger = LogManager.getLogger(ElevateWordService.class); diff --git a/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java b/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java index fc61a78828..eef0bd46c1 100644 --- a/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java +++ b/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java @@ -20,8 +20,6 @@ import java.io.StringWriter; import java.util.List; -import javax.annotation.Resource; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.beans.util.BeanUtil; @@ -39,6 +37,8 @@ import org.dbflute.cbean.result.PagingResultBean; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class FailureUrlService { private static final Logger logger = LogManager.getLogger(FailureUrlService.class); diff --git a/src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java b/src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java index d72c44945f..cf4ea19ab8 100644 --- a/src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java +++ b/src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java @@ -20,8 +20,6 @@ import java.util.List; import java.util.function.BiConsumer; -import javax.annotation.Resource; - import org.codelibs.fess.es.log.exbhv.FavoriteLogBhv; import org.codelibs.fess.es.log.exbhv.UserInfoBhv; import org.codelibs.fess.es.log.exentity.FavoriteLog; @@ -31,6 +29,8 @@ import org.codelibs.fess.util.ComponentUtil; import org.dbflute.cbean.result.ListResultBean; +import jakarta.annotation.Resource; + public class FavoriteLogService { @Resource protected SystemHelper systemHelper; diff --git a/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java b/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java index e3f25e83c5..e5ba034685 100644 --- a/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java +++ b/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java @@ -17,8 +17,6 @@ import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.FileAuthPager; @@ -30,6 +28,8 @@ import org.dbflute.cbean.result.PagingResultBean; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class FileAuthenticationService { @Resource diff --git a/src/main/java/org/codelibs/fess/app/service/FileConfigService.java b/src/main/java/org/codelibs/fess/app/service/FileConfigService.java index ca9b5c47cf..72ac381899 100644 --- a/src/main/java/org/codelibs/fess/app/service/FileConfigService.java +++ b/src/main/java/org/codelibs/fess/app/service/FileConfigService.java @@ -17,8 +17,6 @@ import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -33,6 +31,8 @@ import org.dbflute.cbean.result.PagingResultBean; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class FileConfigService extends FessAppService { @Resource 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 2e99191a39..28a72d0187 100644 --- a/src/main/java/org/codelibs/fess/app/service/GroupService.java +++ b/src/main/java/org/codelibs/fess/app/service/GroupService.java @@ -19,8 +19,6 @@ import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.GroupPager; @@ -33,6 +31,8 @@ import org.dbflute.cbean.result.PagingResultBean; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class GroupService { @Resource diff --git a/src/main/java/org/codelibs/fess/app/service/JobLogService.java b/src/main/java/org/codelibs/fess/app/service/JobLogService.java index 1dc9888839..be153ed3ae 100644 --- a/src/main/java/org/codelibs/fess/app/service/JobLogService.java +++ b/src/main/java/org/codelibs/fess/app/service/JobLogService.java @@ -17,8 +17,6 @@ import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.JobLogPager; @@ -30,6 +28,8 @@ import org.dbflute.cbean.result.PagingResultBean; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class JobLogService { @Resource diff --git a/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java b/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java index b1b107b418..4b0aa16bdb 100644 --- a/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java +++ b/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java @@ -17,8 +17,6 @@ import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -30,6 +28,8 @@ import org.dbflute.cbean.result.PagingResultBean; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class KeyMatchService extends FessAppService { @Resource 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 2456aa39db..eb75200990 100644 --- a/src/main/java/org/codelibs/fess/app/service/KuromojiService.java +++ b/src/main/java/org/codelibs/fess/app/service/KuromojiService.java @@ -18,8 +18,6 @@ import java.util.Collections; import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.KuromojiPager; @@ -30,6 +28,8 @@ import org.codelibs.fess.mylasta.direction.FessConfig; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class KuromojiService { @Resource protected DictionaryManager dictionaryManager; diff --git a/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java b/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java index 4128606a29..5cd2194060 100644 --- a/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java +++ b/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java @@ -17,8 +17,6 @@ import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -32,6 +30,8 @@ import org.dbflute.cbean.result.PagingResultBean; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class LabelTypeService extends FessAppService { @Resource diff --git a/src/main/java/org/codelibs/fess/app/service/PathMappingService.java b/src/main/java/org/codelibs/fess/app/service/PathMappingService.java index ca2b0906dc..dde24b4915 100644 --- a/src/main/java/org/codelibs/fess/app/service/PathMappingService.java +++ b/src/main/java/org/codelibs/fess/app/service/PathMappingService.java @@ -18,8 +18,6 @@ import java.util.Collection; import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -32,6 +30,8 @@ import org.dbflute.cbean.result.PagingResultBean; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class PathMappingService extends FessAppService { @Resource 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 174d4cec7e..8386893035 100644 --- a/src/main/java/org/codelibs/fess/app/service/ProtwordsService.java +++ b/src/main/java/org/codelibs/fess/app/service/ProtwordsService.java @@ -18,8 +18,6 @@ import java.util.Collections; import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.ProtwordsPager; @@ -30,6 +28,8 @@ import org.codelibs.fess.mylasta.direction.FessConfig; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class ProtwordsService { @Resource protected DictionaryManager dictionaryManager; 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 30501686d9..a512e52411 100644 --- a/src/main/java/org/codelibs/fess/app/service/RelatedContentService.java +++ b/src/main/java/org/codelibs/fess/app/service/RelatedContentService.java @@ -17,8 +17,6 @@ import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -31,6 +29,8 @@ import org.dbflute.cbean.result.PagingResultBean; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class RelatedContentService extends FessAppService { @Resource 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 8a1b72401f..7ee8e11d07 100644 --- a/src/main/java/org/codelibs/fess/app/service/RelatedQueryService.java +++ b/src/main/java/org/codelibs/fess/app/service/RelatedQueryService.java @@ -17,8 +17,6 @@ import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -31,6 +29,8 @@ import org.dbflute.cbean.result.PagingResultBean; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class RelatedQueryService extends FessAppService { @Resource diff --git a/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java b/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java index c3827aefbf..de7707e78d 100644 --- a/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java +++ b/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java @@ -17,8 +17,6 @@ import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.ReqHeaderPager; @@ -29,6 +27,8 @@ import org.dbflute.cbean.result.PagingResultBean; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class RequestHeaderService { @Resource 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 d62e1dd436..f40183f0ef 100644 --- a/src/main/java/org/codelibs/fess/app/service/RoleService.java +++ b/src/main/java/org/codelibs/fess/app/service/RoleService.java @@ -19,8 +19,6 @@ import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.RolePager; @@ -33,6 +31,8 @@ import org.dbflute.cbean.result.PagingResultBean; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class RoleService { @Resource diff --git a/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java b/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java index d477519523..30af839df9 100644 --- a/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java +++ b/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java @@ -17,8 +17,6 @@ import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.RoleTypePager; @@ -29,6 +27,8 @@ import org.dbflute.cbean.result.PagingResultBean; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class RoleTypeService { @Resource diff --git a/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java b/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java index 1a56d7752b..d8daec1e52 100644 --- a/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java +++ b/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java @@ -17,8 +17,6 @@ import java.util.List; -import javax.annotation.Resource; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.beans.util.BeanUtil; @@ -33,6 +31,8 @@ import org.dbflute.optional.OptionalEntity; import org.lastaflute.job.LaCron; +import jakarta.annotation.Resource; + public class ScheduledJobService { private static final Logger logger = LogManager.getLogger(ScheduledJobService.class); diff --git a/src/main/java/org/codelibs/fess/app/service/SearchLogService.java b/src/main/java/org/codelibs/fess/app/service/SearchLogService.java index be837ef6e0..1202f0ac44 100644 --- a/src/main/java/org/codelibs/fess/app/service/SearchLogService.java +++ b/src/main/java/org/codelibs/fess/app/service/SearchLogService.java @@ -27,8 +27,6 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.beans.util.BeanUtil; @@ -61,6 +59,8 @@ import org.opensearch.search.aggregations.metrics.Avg; import org.opensearch.search.aggregations.metrics.Cardinality; +import jakarta.annotation.Resource; + public class SearchLogService { private static final String YYYY_MM_DD_HH_MM = "yyyy-MM-dd HH:mm"; 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 03bc4e30af..651831bc8d 100644 --- a/src/main/java/org/codelibs/fess/app/service/StemmerOverrideService.java +++ b/src/main/java/org/codelibs/fess/app/service/StemmerOverrideService.java @@ -18,8 +18,6 @@ import java.util.Collections; import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.StemmerOverridePager; @@ -30,6 +28,8 @@ import org.codelibs.fess.mylasta.direction.FessConfig; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class StemmerOverrideService { @Resource protected DictionaryManager dictionaryManager; 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 ef81732831..6a1f34c311 100644 --- a/src/main/java/org/codelibs/fess/app/service/StopwordsService.java +++ b/src/main/java/org/codelibs/fess/app/service/StopwordsService.java @@ -18,8 +18,6 @@ import java.util.Collections; import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.StopwordsPager; @@ -30,6 +28,8 @@ import org.codelibs.fess.mylasta.direction.FessConfig; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class StopwordsService { @Resource protected DictionaryManager dictionaryManager; 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 5e9eeb3dde..d4a0d4bea8 100644 --- a/src/main/java/org/codelibs/fess/app/service/SynonymService.java +++ b/src/main/java/org/codelibs/fess/app/service/SynonymService.java @@ -18,8 +18,6 @@ import java.util.Collections; import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.SynonymPager; @@ -30,6 +28,8 @@ import org.codelibs.fess.mylasta.direction.FessConfig; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class SynonymService { @Resource protected DictionaryManager dictionaryManager; diff --git a/src/main/java/org/codelibs/fess/app/service/UserInfoService.java b/src/main/java/org/codelibs/fess/app/service/UserInfoService.java index b1332a1ee8..1adfc635ce 100644 --- a/src/main/java/org/codelibs/fess/app/service/UserInfoService.java +++ b/src/main/java/org/codelibs/fess/app/service/UserInfoService.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.service; -import javax.annotation.Resource; - import org.codelibs.fess.es.log.exbhv.UserInfoBhv; import org.codelibs.fess.helper.SystemHelper; +import jakarta.annotation.Resource; + public class UserInfoService { @Resource diff --git a/src/main/java/org/codelibs/fess/app/service/UserService.java b/src/main/java/org/codelibs/fess/app/service/UserService.java index 9958dec863..ea438c657c 100644 --- a/src/main/java/org/codelibs/fess/app/service/UserService.java +++ b/src/main/java/org/codelibs/fess/app/service/UserService.java @@ -17,8 +17,6 @@ import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -33,6 +31,8 @@ import org.dbflute.cbean.result.PagingResultBean; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class UserService { @Resource diff --git a/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java b/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java index 24c342171e..59eafd29c3 100644 --- a/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java +++ b/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java @@ -17,8 +17,6 @@ import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.WebAuthPager; @@ -30,6 +28,8 @@ import org.dbflute.cbean.result.PagingResultBean; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class WebAuthenticationService { @Resource diff --git a/src/main/java/org/codelibs/fess/app/service/WebConfigService.java b/src/main/java/org/codelibs/fess/app/service/WebConfigService.java index 4937022593..5dffc1502d 100644 --- a/src/main/java/org/codelibs/fess/app/service/WebConfigService.java +++ b/src/main/java/org/codelibs/fess/app/service/WebConfigService.java @@ -17,8 +17,6 @@ import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -34,6 +32,8 @@ import org.dbflute.cbean.result.PagingResultBean; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.Resource; + public class WebConfigService extends FessAppService { @Resource 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 1a0f43dd3a..ab3a1749ff 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 @@ -20,8 +20,6 @@ import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -42,6 +40,8 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author shinsuke */ diff --git a/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/CreateForm.java index 915151c232..abf4494aff 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/CreateForm.java @@ -15,15 +15,15 @@ */ package org.codelibs.fess.app.web.admin.accesstoken; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; - import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.validation.CustomSize; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; + public class CreateForm { @ValidateTypeFailure diff --git a/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/EditForm.java index 8b9b990f97..13297492db 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.accesstoken; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author shinsuke * @author jflute 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 3d7cfc2f40..bb02621971 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 @@ -43,8 +43,6 @@ import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.apache.commons.text.StringEscapeUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -80,6 +78,8 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.annotation.Resource; + /** * @author shinsuke */ 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 7914d317f6..3983e5f3e3 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 @@ -25,8 +25,6 @@ import java.nio.file.Files; import java.nio.file.Path; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.concurrent.CommonPoolUtil; import org.codelibs.fess.Constants; @@ -49,6 +47,8 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author Keiichi Watanabe */ diff --git a/src/main/java/org/codelibs/fess/app/web/admin/badword/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/badword/CreateForm.java index d5aeab52e7..9015fb8810 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/badword/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/badword/CreateForm.java @@ -15,13 +15,13 @@ */ package org.codelibs.fess.app.web.admin.badword; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; - import org.codelibs.fess.util.ComponentUtil; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; + /** * @author codelibs * @author Keiichi Watanabe diff --git a/src/main/java/org/codelibs/fess/app/web/admin/badword/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/badword/EditForm.java index 69242871ec..104ff54397 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/badword/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/badword/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.badword; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author Keiichi Watanabe */ 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 f0e771ce0b..d561897044 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 @@ -15,8 +15,6 @@ */ package org.codelibs.fess.app.web.admin.boostdoc; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; @@ -35,6 +33,8 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author shinsuke */ diff --git a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/CreateForm.java index 0266bf8813..f335f89a3a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/CreateForm.java @@ -15,15 +15,15 @@ */ package org.codelibs.fess.app.web.admin.boostdoc; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.Size; - import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.util.ComponentUtil; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Size; + public class CreateForm { @ValidateTypeFailure diff --git a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/EditForm.java index 5ffabffe2a..65e716cb74 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.boostdoc; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author shinsuke * @author jflute 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 418010b0f7..323f0e5448 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 @@ -15,8 +15,6 @@ */ package org.codelibs.fess.app.web.admin.crawlinginfo; -import javax.annotation.Resource; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.fess.Constants; @@ -32,6 +30,8 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author shinsuke * @author Shunji Makino diff --git a/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/EditForm.java index a21d2b6a9d..e1ebb1b256 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.crawlinginfo; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author shinsuke * @author Shunji Makino diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java index 4d14986f47..5961cc9746 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java @@ -15,8 +15,6 @@ */ package org.codelibs.fess.app.web.admin.dashboard; -import javax.annotation.Resource; - import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.api.engine.SearchEngineApiManager; import org.codelibs.fess.app.web.base.FessAdminAction; @@ -25,6 +23,8 @@ import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author shinsuke * @author Keiichi Watanabe 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 785a1516cd..91b275713c 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 @@ -25,8 +25,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Resource; - import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; @@ -49,6 +47,8 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author shinsuke * @author Keiichi Watanabe diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java index d5bc0124da..e9379afcde 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java @@ -15,16 +15,16 @@ */ package org.codelibs.fess.app.web.admin.dataconfig; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.Size; - import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.validation.CustomSize; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Size; + /** * @author codelibs * @author Keiichi Watanabe diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/EditForm.java index 137f976c67..3113ba8a6e 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.dataconfig; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author Keiichi Watanabe */ diff --git a/src/main/java/org/codelibs/fess/app/web/admin/design/UploadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/design/UploadForm.java index 1452b5e867..44d24087db 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/design/UploadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/design/UploadForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.design; -import javax.validation.constraints.Pattern; - import org.lastaflute.web.ruts.multipart.MultipartFormFile; import org.lastaflute.web.validation.Required; +import jakarta.validation.constraints.Pattern; + public class UploadForm { @Required diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/AdminDictAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/AdminDictAction.java index 3371350894..24458cd890 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/AdminDictAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/AdminDictAction.java @@ -15,8 +15,6 @@ */ package org.codelibs.fess.app.web.admin.dict; -import javax.annotation.Resource; - import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.dict.DictionaryFile; @@ -27,6 +25,8 @@ import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author Keiichi Watanabe */ 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 b4aedd6d1d..e5494fef91 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 @@ -19,8 +19,6 @@ import java.io.IOException; import java.io.InputStream; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -44,6 +42,8 @@ import org.lastaflute.web.validation.VaErrorHook; import org.lastaflute.web.validation.exception.ValidationErrorException; +import jakarta.annotation.Resource; + /** * @author shinsuke * @author Keiichi Watanabe diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/CreateForm.java index f106d3cf75..d396bdb63a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/CreateForm.java @@ -15,12 +15,12 @@ */ package org.codelibs.fess.app.web.admin.dict.kuromoji; -import javax.validation.constraints.Size; - import org.codelibs.fess.app.web.CrudMode; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author shinsuke * @author Keiichi Watanabe 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 d8b2dae7c9..531e5a0f01 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 @@ -21,8 +21,6 @@ import java.util.ArrayList; import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -46,6 +44,8 @@ import org.lastaflute.web.validation.VaErrorHook; import org.lastaflute.web.validation.exception.ValidationErrorException; +import jakarta.annotation.Resource; + /** * @author nullpos * @author ma2tani diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/CreateForm.java index 5559383f8a..5f4177b638 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/CreateForm.java @@ -15,12 +15,12 @@ */ package org.codelibs.fess.app.web.admin.dict.mapping; -import javax.validation.constraints.Size; - import org.codelibs.fess.app.web.CrudMode; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author nullpos * @author ma2tani 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 9dafecc0d8..d24928f0d3 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 @@ -19,8 +19,6 @@ import java.io.IOException; import java.io.InputStream; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -44,6 +42,8 @@ import org.lastaflute.web.validation.VaErrorHook; import org.lastaflute.web.validation.exception.ValidationErrorException; +import jakarta.annotation.Resource; + /** * @author ma2tani */ diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/CreateForm.java index 6270061ea7..94bc6e2669 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/CreateForm.java @@ -15,12 +15,12 @@ */ package org.codelibs.fess.app.web.admin.dict.protwords; -import javax.validation.constraints.Size; - import org.codelibs.fess.app.web.CrudMode; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author ma2tani */ 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 e6b215e3de..67e610bbb1 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 @@ -19,8 +19,6 @@ import java.io.IOException; import java.io.InputStream; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -44,6 +42,8 @@ import org.lastaflute.web.validation.VaErrorHook; import org.lastaflute.web.validation.exception.ValidationErrorException; +import jakarta.annotation.Resource; + /** * @author shinsuke */ diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/CreateForm.java index 4ce4b89d5c..9d00a81a12 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/CreateForm.java @@ -15,12 +15,12 @@ */ package org.codelibs.fess.app.web.admin.dict.stemmeroverride; -import javax.validation.constraints.Size; - import org.codelibs.fess.app.web.CrudMode; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author shinsuke * @author Keiichi Watanabe 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 5cc0fdbe52..b7a4cbf850 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 @@ -19,8 +19,6 @@ import java.io.IOException; import java.io.InputStream; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -42,6 +40,8 @@ import org.lastaflute.web.ruts.process.ActionRuntime; import org.lastaflute.web.validation.VaErrorHook; +import jakarta.annotation.Resource; + /** * @author ma2tani */ diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/CreateForm.java index e9641ba5ba..9f2d155b7d 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/CreateForm.java @@ -15,12 +15,12 @@ */ package org.codelibs.fess.app.web.admin.dict.stopwords; -import javax.validation.constraints.Size; - import org.codelibs.fess.app.web.CrudMode; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author ma2tani */ 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 8dd49ec6e5..e1fcfe389e 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 @@ -21,8 +21,6 @@ import java.util.ArrayList; import java.util.List; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -46,6 +44,8 @@ import org.lastaflute.web.validation.VaErrorHook; import org.lastaflute.web.validation.exception.ValidationErrorException; +import jakarta.annotation.Resource; + /** * @author shinsuke * @author Keiichi Watanabe diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/CreateForm.java index 2c29de4a94..52480f22dc 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/CreateForm.java @@ -15,12 +15,12 @@ */ package org.codelibs.fess.app.web.admin.dict.synonym; -import javax.validation.constraints.Size; - import org.codelibs.fess.app.web.CrudMode; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author shinsuke * @author Keiichi Watanabe 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 d6c70de8b9..196014c225 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 @@ -15,8 +15,6 @@ */ package org.codelibs.fess.app.web.admin.duplicatehost; -import javax.annotation.Resource; - import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.DuplicateHostPager; @@ -34,6 +32,8 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author codelibs * @author Keiichi Watanabe diff --git a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/CreateForm.java index 3c335fccf3..8cb42b2484 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/CreateForm.java @@ -15,15 +15,15 @@ */ package org.codelibs.fess.app.web.admin.duplicatehost; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.Size; - import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.util.ComponentUtil; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Size; + /** * @author codelibs * @author Keiichi Watanabe diff --git a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/EditForm.java index 31977d06a0..4a6277aa62 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.duplicatehost; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author Keiichi Watanabe */ 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 573f4567c8..82f9a2b76a 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 @@ -30,8 +30,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.concurrent.CommonPoolUtil; import org.codelibs.core.lang.StringUtil; @@ -57,6 +55,8 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author Keiichi Watanabe */ diff --git a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/CreateForm.java index fbee631f2a..ef1ce0a75e 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/CreateForm.java @@ -15,13 +15,13 @@ */ package org.codelibs.fess.app.web.admin.elevateword; -import javax.validation.constraints.Size; - import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.validation.CustomSize; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author codelibs * @author Keiichi Watanabe diff --git a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/EditForm.java index dcddb431ab..e9f97ef4c4 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.elevateword; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author Keiichi Watanabe */ 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 b26a34d881..f68d7e8408 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 @@ -15,8 +15,6 @@ */ package org.codelibs.fess.app.web.admin.failureurl; -import javax.annotation.Resource; - import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.FailureUrlPager; @@ -29,6 +27,8 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author shinsuke * @author Keiichi Watanabe diff --git a/src/main/java/org/codelibs/fess/app/web/admin/failureurl/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/failureurl/EditForm.java index 7c9c535ce0..89b29a9463 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/failureurl/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/failureurl/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.failureurl; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author codelibs * @author Keiichi Watanabe 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 66d5357819..49cc74d8c1 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 @@ -21,8 +21,6 @@ import java.util.Locale; import java.util.Map; -import javax.annotation.Resource; - import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.FileAuthPager; @@ -42,6 +40,8 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author shinsuke * @author Keiichi Watanabe diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/CreateForm.java index 089bc933d4..98ed62988c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/CreateForm.java @@ -15,15 +15,15 @@ */ package org.codelibs.fess.app.web.admin.fileauth; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.Size; - import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.util.ComponentUtil; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Size; + /** * @author codelibs * @author Keiichi Watanabe diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/EditForm.java index bc5fe6e6b1..6e9cbccfd0 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.fileauth; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author Keiichi Watanabe */ 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 737e332b52..7e1a928f75 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 @@ -21,8 +21,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Resource; - import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; @@ -45,6 +43,8 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author shinsuke * @author Keiichi Watanabe diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java index 39cc0bc885..74385929c5 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java @@ -15,10 +15,6 @@ */ package org.codelibs.fess.app.web.admin.fileconfig; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.Size; - import org.codelibs.fess.Constants; import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.mylasta.direction.FessConfig; @@ -29,6 +25,10 @@ import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Size; + /** * @author codelibs * @author Keiichi Watanabe diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/EditForm.java index c1819adf44..b89b107497 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.fileconfig; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author Keiichi Watanabe */ diff --git a/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java b/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java index 5831b8f00d..d380ca6723 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java @@ -22,8 +22,6 @@ import java.util.List; import java.util.Map; -import javax.annotation.Resource; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.beans.util.BeanUtil; @@ -41,6 +39,8 @@ import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author shinsuke * @author Shunji Makino diff --git a/src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java index 3caf32bb44..2f55e3b96c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java @@ -15,13 +15,13 @@ */ package org.codelibs.fess.app.web.admin.general; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Size; + /** * @author shinsuke * @author Shunji Makino diff --git a/src/main/java/org/codelibs/fess/app/web/admin/general/MailForm.java b/src/main/java/org/codelibs/fess/app/web/admin/general/MailForm.java index c9cad364b2..35633c1ffc 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/general/MailForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/general/MailForm.java @@ -15,10 +15,10 @@ */ package org.codelibs.fess.app.web.admin.general; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; +import jakarta.validation.constraints.Size; + /** * @author shinsuke */ 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 e719b93870..26a0f62c89 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 @@ -19,8 +19,6 @@ import java.util.Map; import java.util.function.Consumer; -import javax.annotation.Resource; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.fess.Constants; @@ -41,6 +39,8 @@ import org.lastaflute.web.ruts.process.ActionRuntime; import org.lastaflute.web.validation.VaMessenger; +import jakarta.annotation.Resource; + /** * @author shinsuke * @author Keiichi Watanabe diff --git a/src/main/java/org/codelibs/fess/app/web/admin/group/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/group/CreateForm.java index 86f5c9c04e..780f20367b 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/group/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/group/CreateForm.java @@ -18,12 +18,12 @@ import java.util.HashMap; import java.util.Map; -import javax.validation.constraints.Size; - import org.codelibs.fess.app.web.CrudMode; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author shinsuke * @author Keiichi Watanabe diff --git a/src/main/java/org/codelibs/fess/app/web/admin/group/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/group/EditForm.java index b83e11d1e9..92de782029 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/group/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/group/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.group; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author Keiichi Watanabe */ 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 7c8e095a23..08cd429c34 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 @@ -18,8 +18,6 @@ import java.util.ArrayList; import java.util.List; -import javax.annotation.Resource; - import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.JobLogPager; @@ -32,6 +30,8 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author shinsuke * @author Shunji Makino 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 9119e206f0..07f5877874 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 @@ -19,8 +19,6 @@ import java.util.List; import java.util.Map; -import javax.annotation.Resource; - import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.KeyMatchPager; @@ -39,6 +37,8 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author shinsuke * @author jflute diff --git a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/CreateForm.java index fb91261bd1..df3815b4eb 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/CreateForm.java @@ -15,16 +15,16 @@ */ package org.codelibs.fess.app.web.admin.keymatch; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.Size; - import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.validation.CustomSize; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Size; + /** * @author codelibs * @author jflute diff --git a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/EditForm.java index bae6f03361..56ad67e53e 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.keymatch; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author codelibs * @author jflute 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 125c32496c..80a8f9ce2e 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 @@ -21,8 +21,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Resource; - import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; @@ -43,6 +41,8 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author shinsuke * @author Shunji Makino diff --git a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/CreateForm.java index 34e49430b3..dcad640dd0 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/CreateForm.java @@ -15,17 +15,17 @@ */ package org.codelibs.fess.app.web.admin.labeltype; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; - import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.validation.CustomSize; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; + /** * @author codelibs * @author Shunji Makino diff --git a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/EditForm.java index 176f6e7b29..2a79b8a8ba 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.labeltype; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author Keiichi Watanabe */ diff --git a/src/main/java/org/codelibs/fess/app/web/admin/maintenance/ActionForm.java b/src/main/java/org/codelibs/fess/app/web/admin/maintenance/ActionForm.java index 0392fcb8ca..7bdf42a535 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/maintenance/ActionForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/maintenance/ActionForm.java @@ -15,10 +15,10 @@ */ package org.codelibs.fess.app.web.admin.maintenance; -import javax.validation.constraints.Size; - import org.codelibs.fess.util.ComponentUtil; +import jakarta.validation.constraints.Size; + public class ActionForm { @Size(max = 10) public String replaceAliases; 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 42cdc71646..f899405165 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 @@ -28,8 +28,6 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import javax.annotation.Resource; - import org.apache.commons.text.StringEscapeUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -49,6 +47,8 @@ import org.lastaflute.web.ruts.process.ActionRuntime; import org.opensearch.core.action.ActionListener; +import jakarta.annotation.Resource; + public class AdminMaintenanceAction extends FessAdminAction { public static final String ROLE = "admin-maintenance"; 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 05fae1fd7c..c7bf409753 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 @@ -15,8 +15,6 @@ */ package org.codelibs.fess.app.web.admin.pathmap; -import javax.annotation.Resource; - import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.PathMapPager; @@ -34,6 +32,8 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author shinsuke * @author Shunji Makino diff --git a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/CreateForm.java index 905d19ca7f..8be1ae183d 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/CreateForm.java @@ -15,15 +15,15 @@ */ package org.codelibs.fess.app.web.admin.pathmap; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.Size; - import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.util.ComponentUtil; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Size; + /** * @author codelibs * @author Shunji Makino diff --git a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/EditForm.java index 69b325ce11..f477d2124c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.pathmap; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author Keiichi Watanabe */ diff --git a/src/main/java/org/codelibs/fess/app/web/admin/plugin/DeleteForm.java b/src/main/java/org/codelibs/fess/app/web/admin/plugin/DeleteForm.java index 27e583bbfc..0da40d8bfe 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/plugin/DeleteForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/plugin/DeleteForm.java @@ -15,10 +15,10 @@ */ package org.codelibs.fess.app.web.admin.plugin; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; +import jakarta.validation.constraints.Size; + public class DeleteForm { @Required diff --git a/src/main/java/org/codelibs/fess/app/web/admin/plugin/InstallForm.java b/src/main/java/org/codelibs/fess/app/web/admin/plugin/InstallForm.java index 4a7c1fca1c..b0510be4f8 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/plugin/InstallForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/plugin/InstallForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.plugin; -import javax.validation.constraints.Size; - import org.lastaflute.web.ruts.multipart.MultipartFormFile; import org.lastaflute.web.validation.Required; +import jakarta.validation.constraints.Size; + public class InstallForm { @Required 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 5d28c7d845..102f702e3d 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 @@ -15,8 +15,6 @@ */ package org.codelibs.fess.app.web.admin.relatedcontent; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; @@ -35,6 +33,8 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author shinsuke */ diff --git a/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/CreateForm.java index d154a3b5f8..14246ac617 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/CreateForm.java @@ -15,15 +15,15 @@ */ package org.codelibs.fess.app.web.admin.relatedcontent; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.Size; - import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.util.ComponentUtil; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Size; + public class CreateForm { @ValidateTypeFailure diff --git a/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/EditForm.java index 67ad6c3873..ecee350fae 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.relatedcontent; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author shinsuke */ 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 51a26854c2..6165bebf18 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 @@ -21,8 +21,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -42,6 +40,8 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author shinsuke */ diff --git a/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/CreateForm.java index 4787446c9c..32b8a7936c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/CreateForm.java @@ -15,13 +15,13 @@ */ package org.codelibs.fess.app.web.admin.relatedquery; -import javax.validation.constraints.Size; - import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.util.ComponentUtil; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + public class CreateForm { @ValidateTypeFailure diff --git a/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/EditForm.java index c85a43cf54..a19a8920fb 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.relatedquery; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author shinsuke */ 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 7763f954b0..d99a1827ba 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 @@ -20,8 +20,6 @@ import java.util.List; import java.util.Map; -import javax.annotation.Resource; - import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.ReqHeaderPager; @@ -41,6 +39,8 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author shinsuke * @author Shunji Makino diff --git a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/CreateForm.java index 514cfe18ab..cea16a1728 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/CreateForm.java @@ -15,13 +15,13 @@ */ package org.codelibs.fess.app.web.admin.reqheader; -import javax.validation.constraints.Size; - import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.util.ComponentUtil; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author codelibs * @author Shunji Makino diff --git a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/EditForm.java index a61410549e..0544bf3f16 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.reqheader; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author Keiichi Watanabe */ 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 0324d4d72a..4984f5fc47 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 @@ -17,8 +17,6 @@ import java.util.Base64; -import javax.annotation.Resource; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.fess.Constants; @@ -37,6 +35,8 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author shinsuke * @author Keiichi Watanabe diff --git a/src/main/java/org/codelibs/fess/app/web/admin/role/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/role/CreateForm.java index f90619dc97..a522743938 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/role/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/role/CreateForm.java @@ -18,12 +18,12 @@ import java.util.HashMap; import java.util.Map; -import javax.validation.constraints.Size; - import org.codelibs.fess.app.web.CrudMode; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author shinsuke * @author Keiichi Watanabe diff --git a/src/main/java/org/codelibs/fess/app/web/admin/role/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/role/EditForm.java index 61078ffeed..741dc97663 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/role/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/role/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.role; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author Keiichi Watanabe */ 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 4ccf892893..08cd08e260 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 @@ -18,8 +18,6 @@ import java.text.MessageFormat; import java.util.Base64; -import javax.annotation.Resource; - import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.SchedulerPager; @@ -39,6 +37,8 @@ import org.lastaflute.web.ruts.process.ActionRuntime; import org.lastaflute.web.util.LaRequestUtil; +import jakarta.annotation.Resource; + /** * @author shinsuke * @author Keiichi Watanabe diff --git a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/CreateForm.java index 3a2eb86442..d6395e050f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/CreateForm.java @@ -15,10 +15,6 @@ */ package org.codelibs.fess.app.web.admin.scheduler; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.Size; - import org.codelibs.fess.Constants; import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.validation.CronExpression; @@ -26,6 +22,10 @@ import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Size; + /** * @author shinsuke */ diff --git a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/EditForm.java index a9e4e7ac08..2c1adab281 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.scheduler; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author Keiichi Watanabe */ 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 66457cbd9b..ffe0af05b7 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 @@ -20,9 +20,6 @@ import java.util.Map; import java.util.function.Consumer; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -51,6 +48,9 @@ import org.opensearch.index.query.QueryBuilder; import org.opensearch.index.query.QueryBuilders; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; + /** * @author shinsuke * @author Keiichi Watanabe diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/DeleteForm.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/DeleteForm.java index 45f1a21ede..7a5152e259 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/DeleteForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/DeleteForm.java @@ -15,10 +15,10 @@ */ package org.codelibs.fess.app.web.admin.searchlist; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; +import jakarta.validation.constraints.Size; + public class DeleteForm { @Size(max = 1000) diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java index 2fac0ee4c4..6effc87caf 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java @@ -21,8 +21,6 @@ import java.util.Locale; import java.util.Map; -import javax.validation.constraints.Size; - import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.entity.FacetInfo; import org.codelibs.fess.entity.GeoInfo; @@ -33,6 +31,8 @@ import org.lastaflute.web.util.LaRequestUtil; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author shinsuke * @author Keiichi Watanabe 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 e98b58cd79..3963646da9 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 @@ -15,8 +15,6 @@ */ package org.codelibs.fess.app.web.admin.searchlog; -import javax.annotation.Resource; - import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.SearchLogPager; @@ -29,6 +27,8 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author shinsuke */ diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlog/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlog/EditForm.java index b745a8172b..f02ffb0995 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/searchlog/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlog/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.searchlog; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author shinsuke */ diff --git a/src/main/java/org/codelibs/fess/app/web/admin/storage/ItemForm.java b/src/main/java/org/codelibs/fess/app/web/admin/storage/ItemForm.java index 6b0c700dc0..8308b3fd7c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/storage/ItemForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/storage/ItemForm.java @@ -15,10 +15,10 @@ */ package org.codelibs.fess.app.web.admin.storage; -import javax.validation.constraints.Size; - import org.lastaflute.web.ruts.multipart.MultipartFormFile; +import jakarta.validation.constraints.Size; + public class ItemForm { public String path; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/storage/TagForm.java b/src/main/java/org/codelibs/fess/app/web/admin/storage/TagForm.java index fc90ebc929..d31beb5f67 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/storage/TagForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/storage/TagForm.java @@ -18,10 +18,10 @@ import java.util.HashMap; import java.util.Map; -import javax.validation.constraints.Size; - import org.apache.logging.log4j.core.config.plugins.validation.constraints.Required; +import jakarta.validation.constraints.Size; + public class TagForm { @Required diff --git a/src/main/java/org/codelibs/fess/app/web/admin/suggest/AdminSuggestAction.java b/src/main/java/org/codelibs/fess/app/web/admin/suggest/AdminSuggestAction.java index 1d4992bcba..555b56b57a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/suggest/AdminSuggestAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/suggest/AdminSuggestAction.java @@ -15,8 +15,6 @@ */ package org.codelibs.fess.app.web.admin.suggest; -import javax.annotation.Resource; - import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.helper.SuggestHelper; @@ -24,6 +22,8 @@ import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author yfujita */ 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 0700e34edb..0184cac20d 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 @@ -20,8 +20,6 @@ import java.util.List; import java.util.Map; -import javax.annotation.Resource; - import org.codelibs.core.lang.StringUtil; import org.codelibs.core.misc.DynamicProperties; import org.codelibs.fess.Constants; @@ -36,6 +34,8 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author Keiichi Watanabe */ 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 c7c0d6c251..2540b51204 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 @@ -20,8 +20,6 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -47,6 +45,8 @@ import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + public class AdminUpgradeAction extends FessAdminAction { public static final String ROLE = "admin-upgrade"; 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 cf29cc7eef..e7e424ee30 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 @@ -20,8 +20,6 @@ import java.util.Map; import java.util.function.Consumer; -import javax.annotation.Resource; - import org.apache.commons.lang3.ArrayUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -48,6 +46,8 @@ import org.lastaflute.web.validation.VaErrorHook; import org.lastaflute.web.validation.VaMessenger; +import jakarta.annotation.Resource; + /** * @author shinsuke * @author Keiichi Watanabe diff --git a/src/main/java/org/codelibs/fess/app/web/admin/user/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/user/CreateForm.java index 9cc8855338..ce19f8413d 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/user/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/user/CreateForm.java @@ -18,12 +18,12 @@ import java.util.HashMap; import java.util.Map; -import javax.validation.constraints.Size; - import org.codelibs.fess.app.web.CrudMode; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author shinsuke * @author Keiichi Watanabe diff --git a/src/main/java/org/codelibs/fess/app/web/admin/user/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/user/EditForm.java index 5e8b664a72..3c528d7d3b 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/user/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/user/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.user; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author Keiichi Watanabe */ 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 41b41ed568..87bb9f2c23 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 @@ -21,8 +21,6 @@ import java.util.Locale; import java.util.Map; -import javax.annotation.Resource; - import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.WebAuthPager; @@ -42,6 +40,8 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author shinsuke * @author Shunji Makino diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webauth/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/webauth/CreateForm.java index 6ad1c3ca36..e65bb56919 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webauth/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webauth/CreateForm.java @@ -15,15 +15,15 @@ */ package org.codelibs.fess.app.web.admin.webauth; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.Size; - import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.util.ComponentUtil; import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Size; + /** * @author codelibs * @author Shunji Makino diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webauth/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/webauth/EditForm.java index a959e0fa6d..e117ccad4b 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webauth/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webauth/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.webauth; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author codelibs * @author Shunji Makino 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 091c1aaf9d..b1a9b682e9 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 @@ -21,8 +21,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Resource; - import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; @@ -46,6 +44,8 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + /** * @author shinsuke * @author Shunji Makino diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/CreateForm.java index 68adc21bcb..49e665480d 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/CreateForm.java @@ -15,10 +15,6 @@ */ package org.codelibs.fess.app.web.admin.webconfig; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.Size; - import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.web.CrudMode; @@ -30,6 +26,10 @@ import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Size; + /** * @author shinsuke * @author Shunji Makino diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/EditForm.java index 3f55a0816f..c02d3ea301 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/EditForm.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.app.web.admin.webconfig; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + /** * @author Keiichi Watanabe */ diff --git a/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java b/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java index 5d1bc89f44..11dc59b841 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java @@ -19,8 +19,6 @@ import java.net.URLEncoder; import java.util.List; -import javax.annotation.Resource; - import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -44,6 +42,8 @@ import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; + public class AdminWizardAction extends FessAdminAction { public static final String ROLE = "admin-wizard"; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/wizard/CrawlingConfigForm.java b/src/main/java/org/codelibs/fess/app/web/admin/wizard/CrawlingConfigForm.java index c38e40ce85..a0f8e7f4ed 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/wizard/CrawlingConfigForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/wizard/CrawlingConfigForm.java @@ -15,13 +15,13 @@ */ package org.codelibs.fess.app.web.admin.wizard; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Size; + public class CrawlingConfigForm { @Required 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 2577a72f19..6bce532de4 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 @@ -21,8 +21,6 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; - import org.codelibs.fess.entity.SearchRenderData; import org.codelibs.fess.mylasta.action.FessMessages; import org.codelibs.fess.util.ComponentUtil; @@ -30,6 +28,8 @@ import org.lastaflute.web.util.LaRequestUtil; import org.lastaflute.web.validation.VaMessenger; +import jakarta.servlet.http.HttpServletRequest; + public class ApiResult { protected ApiResponse response = null; diff --git a/src/main/java/org/codelibs/fess/app/web/api/FessApiAction.java b/src/main/java/org/codelibs/fess/app/web/api/FessApiAction.java index 1cec1e604b..a62f35d404 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/FessApiAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/FessApiAction.java @@ -18,9 +18,6 @@ import java.util.Locale; import java.util.stream.Collectors; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - import org.codelibs.fess.app.service.AccessTokenService; import org.codelibs.fess.app.web.api.ApiResult.ApiErrorResponse; import org.codelibs.fess.app.web.api.ApiResult.Status; @@ -33,6 +30,9 @@ import org.lastaflute.web.ruts.process.ActionRuntime; import org.lastaflute.web.validation.VaMessenger; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; + public abstract class FessApiAction extends FessBaseAction { @Resource 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 f5e1b7c50a..c79e427ff6 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 @@ -29,8 +29,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.core.concurrent.CommonPoolUtil; import org.codelibs.fess.app.pager.BadWordPager; import org.codelibs.fess.app.service.BadWordService; @@ -48,6 +46,8 @@ import org.lastaflute.web.response.JsonResponse; import org.lastaflute.web.response.StreamResponse; +import jakarta.annotation.Resource; + public class ApiAdminBadwordAction extends FessApiAdminAction { @Resource diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java index 4e7ef97c29..5ef1512ad9 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java @@ -20,8 +20,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.CopyOptions; import org.codelibs.fess.app.pager.BoostDocPager; import org.codelibs.fess.app.service.BoostDocumentRuleService; @@ -37,6 +35,8 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + /** * @author shinsuke */ diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java index dfb438da85..60a3489d1f 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java @@ -18,8 +18,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.fess.app.pager.CrawlingInfoPager; import org.codelibs.fess.app.service.CrawlingInfoService; import org.codelibs.fess.app.web.api.ApiResult; @@ -32,6 +30,8 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + /** * @author Keiichi Watanabe */ 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 7278716047..de0c6ad3ab 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 @@ -21,8 +21,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.DataConfigPager; @@ -40,6 +38,8 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + /** * @author Keiichi Watanabe */ 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 437ad2f3a0..5e19ac2400 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 @@ -18,8 +18,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.Resource; - import org.codelibs.fess.app.web.api.ApiResult; import org.codelibs.fess.app.web.api.admin.FessApiAdminAction; import org.codelibs.fess.dict.DictionaryFile; @@ -28,6 +26,8 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + public class ApiAdminDictAction extends FessApiAdminAction { @Resource protected DictionaryManager dictionaryManager; 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 d4be55f7b8..92fc1ece44 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 @@ -22,8 +22,6 @@ import java.io.InputStream; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.fess.app.pager.KuromojiPager; import org.codelibs.fess.app.service.KuromojiService; import org.codelibs.fess.app.web.CrudMode; @@ -36,6 +34,8 @@ import org.lastaflute.web.response.JsonResponse; import org.lastaflute.web.response.StreamResponse; +import jakarta.annotation.Resource; + public class ApiAdminDictKuromojiAction extends FessApiAdminAction { @Resource 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 ebf53fef4c..396c248b21 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 @@ -22,8 +22,6 @@ import java.io.InputStream; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.fess.app.pager.CharMappingPager; import org.codelibs.fess.app.service.CharMappingService; import org.codelibs.fess.app.web.CrudMode; @@ -36,6 +34,8 @@ import org.lastaflute.web.response.JsonResponse; import org.lastaflute.web.response.StreamResponse; +import jakarta.annotation.Resource; + public class ApiAdminDictMappingAction extends FessApiAdminAction { @Resource 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 f45f82256e..fd48ef70f1 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 @@ -22,8 +22,6 @@ import java.io.InputStream; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.fess.app.pager.ProtwordsPager; import org.codelibs.fess.app.service.ProtwordsService; import org.codelibs.fess.app.web.CrudMode; @@ -36,6 +34,8 @@ import org.lastaflute.web.response.JsonResponse; import org.lastaflute.web.response.StreamResponse; +import jakarta.annotation.Resource; + public class ApiAdminDictProtwordsAction extends FessApiAdminAction { @Resource private ProtwordsService protwordsService; 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 610bce6856..56048d04e6 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 @@ -22,8 +22,6 @@ import java.io.InputStream; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.fess.app.pager.StemmerOverridePager; import org.codelibs.fess.app.service.StemmerOverrideService; import org.codelibs.fess.app.web.CrudMode; @@ -36,6 +34,8 @@ import org.lastaflute.web.response.JsonResponse; import org.lastaflute.web.response.StreamResponse; +import jakarta.annotation.Resource; + public class ApiAdminDictStemmeroverrideAction extends FessApiAdminAction { @Resource 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 25b04cf775..6faef2d293 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 @@ -22,8 +22,6 @@ import java.io.InputStream; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.fess.app.pager.StopwordsPager; import org.codelibs.fess.app.service.StopwordsService; import org.codelibs.fess.app.web.CrudMode; @@ -36,6 +34,8 @@ import org.lastaflute.web.response.JsonResponse; import org.lastaflute.web.response.StreamResponse; +import jakarta.annotation.Resource; + public class ApiAdminDictStopwordsAction extends FessApiAdminAction { @Resource private StopwordsService stopwordsService; 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 677628660d..d2879fb997 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 @@ -22,8 +22,6 @@ import java.io.InputStream; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.fess.app.pager.SynonymPager; import org.codelibs.fess.app.service.SynonymService; import org.codelibs.fess.app.web.CrudMode; @@ -36,6 +34,8 @@ import org.lastaflute.web.response.JsonResponse; import org.lastaflute.web.response.StreamResponse; +import jakarta.annotation.Resource; + public class ApiAdminDictSynonymAction extends FessApiAdminAction { @Resource 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 037b058b4e..9e058f813f 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 @@ -20,8 +20,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.fess.app.pager.DuplicateHostPager; import org.codelibs.fess.app.service.DuplicateHostService; import org.codelibs.fess.app.web.CrudMode; @@ -35,6 +33,8 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + /** * @author Keiichi Watanabe */ 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 186a439f44..0003a881f5 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 @@ -30,8 +30,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.core.concurrent.CommonPoolUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -52,6 +50,8 @@ import org.lastaflute.web.response.JsonResponse; import org.lastaflute.web.response.StreamResponse; +import jakarta.annotation.Resource; + public class ApiAdminElevatewordAction extends FessApiAdminAction { @Resource diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java index 3c1d6aaa38..5aa83ffe21 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java @@ -18,8 +18,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.fess.app.pager.FailureUrlPager; import org.codelibs.fess.app.service.FailureUrlService; import org.codelibs.fess.app.web.api.ApiResult; @@ -32,6 +30,8 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + /** * @author Keiichi Watanabe */ 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 b535ea448e..7724c4a3a0 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 @@ -20,8 +20,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.fess.app.pager.FileAuthPager; import org.codelibs.fess.app.service.FileAuthenticationService; import org.codelibs.fess.app.service.FileConfigService; @@ -37,6 +35,8 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + /** * @author Keiichi Watanabe */ 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 55fb0cdd3a..3888bc474a 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 @@ -21,8 +21,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.FileConfigPager; @@ -40,6 +38,8 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + /** * @author Keiichi Watanabe */ diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/general/ApiAdminGeneralAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/general/ApiAdminGeneralAction.java index 75e911dc61..da99a0081b 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/general/ApiAdminGeneralAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/general/ApiAdminGeneralAction.java @@ -15,8 +15,6 @@ */ package org.codelibs.fess.app.web.api.admin.general; -import javax.annotation.Resource; - import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.beans.util.CopyOptions; import org.codelibs.core.misc.DynamicProperties; @@ -29,6 +27,8 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + /** * @author shinsuke */ 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 b33c2bd366..07c1a3d805 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 @@ -21,8 +21,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.fess.app.pager.GroupPager; import org.codelibs.fess.app.service.GroupService; import org.codelibs.fess.app.web.CrudMode; @@ -33,6 +31,8 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + public class ApiAdminGroupAction extends FessApiAdminAction { @Resource diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java index d55957ad56..436ceae5d4 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java @@ -18,8 +18,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.fess.app.pager.JobLogPager; import org.codelibs.fess.app.service.JobLogService; import org.codelibs.fess.app.web.api.ApiResult; @@ -31,6 +29,8 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + /** * @author Keiichi Watanabe */ 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 fdcf4d56b2..7cec7435c6 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 @@ -20,8 +20,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.fess.app.pager.KeyMatchPager; import org.codelibs.fess.app.service.KeyMatchService; import org.codelibs.fess.app.web.CrudMode; @@ -35,6 +33,8 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + /** * @author Keiichi Watanabe */ 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 34e41b054f..e0a86cad93 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 @@ -21,8 +21,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.LabelTypePager; @@ -40,6 +38,8 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + /** * @author Keiichi Watanabe */ 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 35286fefda..9d6f8a0b4a 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 @@ -20,8 +20,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.PathMapPager; import org.codelibs.fess.app.service.PathMappingService; @@ -32,6 +30,8 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + public class ApiAdminPathmapAction extends FessApiAdminAction { @Resource diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/plugin/InstallBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/plugin/InstallBody.java index 03d1dd7fb1..00c3b9fc66 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/plugin/InstallBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/plugin/InstallBody.java @@ -15,10 +15,10 @@ */ package org.codelibs.fess.app.web.api.admin.plugin; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; +import jakarta.validation.constraints.Size; + public class InstallBody { @Required @Size(max = 100) 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 f60d2322e1..5baeef06c0 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 @@ -20,8 +20,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.fess.app.pager.RelatedContentPager; import org.codelibs.fess.app.service.RelatedContentService; import org.codelibs.fess.app.web.CrudMode; @@ -35,6 +33,8 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + public class ApiAdminRelatedcontentAction extends FessApiAdminAction { // =================================================================================== 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 697341bc8a..6df35c2e07 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 @@ -21,8 +21,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.RelatedQueryPager; @@ -38,6 +36,8 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + public class ApiAdminRelatedqueryAction extends FessApiAdminAction { // =================================================================================== 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 a39981a1ff..b289622972 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 @@ -20,8 +20,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.fess.app.pager.ReqHeaderPager; import org.codelibs.fess.app.service.RequestHeaderService; import org.codelibs.fess.app.service.WebConfigService; @@ -37,6 +35,8 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + /** * @author Keiichi Watanabe */ 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 6a2910fdb5..bf1dbadfba 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 @@ -20,8 +20,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.fess.app.pager.RolePager; import org.codelibs.fess.app.service.RoleService; import org.codelibs.fess.app.web.CrudMode; @@ -31,6 +29,8 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + public class ApiAdminRoleAction extends FessApiAdminAction { @Resource 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 9c0ab5740d..6647733778 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 @@ -20,8 +20,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.SchedulerPager; import org.codelibs.fess.app.service.ScheduledJobService; @@ -35,6 +33,8 @@ import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + public class ApiAdminSchedulerAction extends FessApiAdminAction { @Resource 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 090a62b50e..db46fed4db 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 @@ -20,8 +20,6 @@ import java.util.Map; -import javax.annotation.Resource; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -46,6 +44,8 @@ import org.opensearch.index.query.QueryBuilder; import org.opensearch.index.query.QueryBuilders; +import jakarta.annotation.Resource; + /** * @author shinsuke */ diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/suggest/ApiAdminSuggestAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/suggest/ApiAdminSuggestAction.java index 2925f1d3e1..dcd6e749a7 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/suggest/ApiAdminSuggestAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/suggest/ApiAdminSuggestAction.java @@ -15,14 +15,14 @@ */ package org.codelibs.fess.app.web.api.admin.suggest; -import javax.annotation.Resource; - import org.codelibs.fess.app.web.api.ApiResult; import org.codelibs.fess.app.web.api.admin.FessApiAdminAction; import org.codelibs.fess.helper.SuggestHelper; import org.lastaflute.web.Execute; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + public class ApiAdminSuggestAction extends FessApiAdminAction { @Resource 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 9cba56f733..6880777d60 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 @@ -21,8 +21,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.fess.app.pager.UserPager; import org.codelibs.fess.app.service.UserService; import org.codelibs.fess.app.web.CrudMode; @@ -32,6 +30,8 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + public class ApiAdminUserAction extends FessApiAdminAction { @Resource 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 c8f633a2e6..0c8171311b 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 @@ -20,8 +20,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.fess.app.pager.WebAuthPager; import org.codelibs.fess.app.service.WebAuthenticationService; import org.codelibs.fess.app.service.WebConfigService; @@ -37,6 +35,8 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + /** * @author Keiichi Watanabe */ 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 647f40e7d7..c06b08db4f 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 @@ -21,8 +21,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.WebConfigPager; @@ -40,6 +38,8 @@ import org.lastaflute.web.Execute; import org.lastaflute.web.response.JsonResponse; +import jakarta.annotation.Resource; + /** * @author Keiichi Watanabe */ 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 a7728e8776..a3aa4fc046 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 @@ -15,9 +15,6 @@ */ package org.codelibs.fess.app.web.base; -import javax.annotation.Resource; -import javax.servlet.ServletContext; - import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.exception.UserRoleLoginException; import org.codelibs.fess.helper.CrawlingConfigHelper; @@ -28,6 +25,9 @@ import org.lastaflute.web.ruts.process.ActionRuntime; import org.lastaflute.web.util.LaServletContextUtil; +import jakarta.annotation.Resource; +import jakarta.servlet.ServletContext; + /** * @author codelibs * @author jflute diff --git a/src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java b/src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java index bb2c2af797..5dc34590c5 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java +++ b/src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java @@ -18,8 +18,6 @@ import java.util.Map; import java.util.function.Consumer; -import javax.annotation.Resource; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.beans.util.BeanUtil; @@ -49,6 +47,8 @@ import org.lastaflute.web.validation.LaValidatable; import org.lastaflute.web.validation.VaMessenger; +import jakarta.annotation.Resource; + /** * @author jflute */ 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 eb9a5161a4..2e77cdeac6 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 @@ -23,10 +23,6 @@ import java.util.Map; import java.util.Set; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - import org.apache.commons.text.StringEscapeUtils; import org.codelibs.core.lang.StringUtil; import org.codelibs.core.net.URLUtil; @@ -51,6 +47,10 @@ import org.lastaflute.web.response.next.HtmlNext; import org.lastaflute.web.ruts.process.ActionRuntime; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; + public abstract class FessSearchAction extends FessBaseAction { protected static final String LABEL_FIELD = "label"; diff --git a/src/main/java/org/codelibs/fess/app/web/base/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/base/SearchForm.java index 901adba464..2f74c24f4a 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/base/SearchForm.java @@ -21,8 +21,6 @@ import java.util.Locale; import java.util.Map; -import javax.validation.constraints.Size; - import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.entity.FacetInfo; import org.codelibs.fess.entity.GeoInfo; @@ -33,6 +31,8 @@ import org.lastaflute.web.util.LaRequestUtil; import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure; +import jakarta.validation.constraints.Size; + public class SearchForm extends SearchRequestParams { public Map fields = new HashMap<>(); diff --git a/src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java b/src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java index bb214f2c4a..986d250b30 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java +++ b/src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java @@ -18,8 +18,6 @@ import java.lang.reflect.Method; import java.util.function.Function; -import javax.annotation.Resource; - import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.web.RootAction; import org.codelibs.fess.app.web.base.FessAdminAction; @@ -43,6 +41,8 @@ import org.lastaflute.web.login.option.LoginSpecifiedOption; import org.lastaflute.web.servlet.session.SessionManager; +import jakarta.annotation.Resource; + /** * @author jflute * @author shinsuke diff --git a/src/main/java/org/codelibs/fess/app/web/base/login/SamlCredential.java b/src/main/java/org/codelibs/fess/app/web/base/login/SamlCredential.java index dddb53eae0..93c854e886 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/login/SamlCredential.java +++ b/src/main/java/org/codelibs/fess/app/web/base/login/SamlCredential.java @@ -30,10 +30,9 @@ import org.codelibs.fess.helper.SystemHelper; import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.util.ComponentUtil; +import org.codelibs.saml2.Auth; import org.lastaflute.web.login.credential.LoginCredential; -import com.onelogin.saml2.Auth; - public class SamlCredential implements LoginCredential, FessCredential { private final Map> attributes; diff --git a/src/main/java/org/codelibs/fess/app/web/cache/CacheForm.java b/src/main/java/org/codelibs/fess/app/web/cache/CacheForm.java index 28f3788ecc..4428cb9632 100644 --- a/src/main/java/org/codelibs/fess/app/web/cache/CacheForm.java +++ b/src/main/java/org/codelibs/fess/app/web/cache/CacheForm.java @@ -18,10 +18,10 @@ import java.util.HashMap; import java.util.Map; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; +import jakarta.validation.constraints.Size; + public class CacheForm { @Required 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 8df6f64798..09001573fc 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 @@ -20,8 +20,6 @@ import java.net.URLEncoder; import java.util.Map; -import javax.annotation.Resource; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -42,6 +40,8 @@ import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.response.StreamResponse; +import jakarta.annotation.Resource; + public class GoAction extends FessSearchAction { // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/go/GoForm.java b/src/main/java/org/codelibs/fess/app/web/go/GoForm.java index 847d81aa47..dc0aa735b7 100644 --- a/src/main/java/org/codelibs/fess/app/web/go/GoForm.java +++ b/src/main/java/org/codelibs/fess/app/web/go/GoForm.java @@ -18,10 +18,10 @@ import java.util.HashMap; import java.util.Map; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; +import jakarta.validation.constraints.Size; + public class GoForm { @Required @Size(max = 100) diff --git a/src/main/java/org/codelibs/fess/app/web/login/LoginAction.java b/src/main/java/org/codelibs/fess/app/web/login/LoginAction.java index 426ff1bbac..1c9a51ee42 100644 --- a/src/main/java/org/codelibs/fess/app/web/login/LoginAction.java +++ b/src/main/java/org/codelibs/fess/app/web/login/LoginAction.java @@ -15,9 +15,6 @@ */ package org.codelibs.fess.app.web.login; -import javax.annotation.Resource; -import javax.servlet.http.HttpSession; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -35,6 +32,9 @@ import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.validation.VaErrorHook; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpSession; + public class LoginAction extends FessLoginAction { private static final Logger logger = LogManager.getLogger(LoginAction.class); diff --git a/src/main/java/org/codelibs/fess/app/web/login/LoginForm.java b/src/main/java/org/codelibs/fess/app/web/login/LoginForm.java index 9aa6fc16f8..d2bfe5dd79 100644 --- a/src/main/java/org/codelibs/fess/app/web/login/LoginForm.java +++ b/src/main/java/org/codelibs/fess/app/web/login/LoginForm.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.app.web.login; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; public class LoginForm { diff --git a/src/main/java/org/codelibs/fess/app/web/login/PasswordForm.java b/src/main/java/org/codelibs/fess/app/web/login/PasswordForm.java index 8d7dd7651c..fcca2c9472 100644 --- a/src/main/java/org/codelibs/fess/app/web/login/PasswordForm.java +++ b/src/main/java/org/codelibs/fess/app/web/login/PasswordForm.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.app.web.login; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; public class PasswordForm { 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 52840f084a..50fe2172c1 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 @@ -19,8 +19,6 @@ */ package org.codelibs.fess.app.web.profile; -import javax.annotation.Resource; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.fess.app.service.UserService; @@ -32,6 +30,8 @@ import org.lastaflute.web.response.HtmlResponse; import org.lastaflute.web.validation.VaErrorHook; +import jakarta.annotation.Resource; + public class ProfileAction extends FessSearchAction { private static final Logger logger = LogManager.getLogger(ProfileAction.class); diff --git a/src/main/java/org/codelibs/fess/app/web/profile/ProfileForm.java b/src/main/java/org/codelibs/fess/app/web/profile/ProfileForm.java index a5899be471..813ba73108 100644 --- a/src/main/java/org/codelibs/fess/app/web/profile/ProfileForm.java +++ b/src/main/java/org/codelibs/fess/app/web/profile/ProfileForm.java @@ -18,7 +18,7 @@ */ package org.codelibs.fess.app.web.profile; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; public class ProfileForm { 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 16cbc87db4..d751889cf4 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 @@ -25,9 +25,6 @@ import java.util.Map; import java.util.Set; -import javax.annotation.Resource; -import javax.servlet.http.HttpSession; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -47,6 +44,9 @@ import org.lastaflute.web.response.render.RenderData; import org.lastaflute.web.util.LaRequestUtil; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpSession; + public class SearchAction extends FessSearchAction { // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/thumbnail/ThumbnailAction.java b/src/main/java/org/codelibs/fess/app/web/thumbnail/ThumbnailAction.java index f8b4082093..929c97bb6b 100644 --- a/src/main/java/org/codelibs/fess/app/web/thumbnail/ThumbnailAction.java +++ b/src/main/java/org/codelibs/fess/app/web/thumbnail/ThumbnailAction.java @@ -20,15 +20,15 @@ import java.io.FileInputStream; import java.util.Map; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; - import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.app.web.base.FessSearchAction; import org.codelibs.fess.util.DocumentUtil; import org.lastaflute.web.Execute; import org.lastaflute.web.response.ActionResponse; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; + public class ThumbnailAction extends FessSearchAction { // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/thumbnail/ThumbnailForm.java b/src/main/java/org/codelibs/fess/app/web/thumbnail/ThumbnailForm.java index a3f65b666f..5d7d314c19 100644 --- a/src/main/java/org/codelibs/fess/app/web/thumbnail/ThumbnailForm.java +++ b/src/main/java/org/codelibs/fess/app/web/thumbnail/ThumbnailForm.java @@ -18,10 +18,10 @@ import java.util.HashMap; import java.util.Map; -import javax.validation.constraints.Size; - import org.lastaflute.web.validation.Required; +import jakarta.validation.constraints.Size; + public class ThumbnailForm { @Required diff --git a/src/main/java/org/codelibs/fess/cors/CorsHandler.java b/src/main/java/org/codelibs/fess/cors/CorsHandler.java index 240e34ad34..c3f355f8e6 100644 --- a/src/main/java/org/codelibs/fess/cors/CorsHandler.java +++ b/src/main/java/org/codelibs/fess/cors/CorsHandler.java @@ -15,8 +15,8 @@ */ package org.codelibs.fess.cors; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; public abstract class CorsHandler { diff --git a/src/main/java/org/codelibs/fess/cors/DefaultCorsHandler.java b/src/main/java/org/codelibs/fess/cors/DefaultCorsHandler.java index d35cf2c627..d976d2bb2b 100644 --- a/src/main/java/org/codelibs/fess/cors/DefaultCorsHandler.java +++ b/src/main/java/org/codelibs/fess/cors/DefaultCorsHandler.java @@ -15,14 +15,14 @@ */ package org.codelibs.fess.cors; -import javax.annotation.PostConstruct; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletResponse; - import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.util.ComponentUtil; +import jakarta.annotation.PostConstruct; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletResponse; + public class DefaultCorsHandler extends CorsHandler { @PostConstruct diff --git a/src/main/java/org/codelibs/fess/crawler/processor/FessResponseProcessor.java b/src/main/java/org/codelibs/fess/crawler/processor/FessResponseProcessor.java index 4e69fe6a23..77fae6f87e 100644 --- a/src/main/java/org/codelibs/fess/crawler/processor/FessResponseProcessor.java +++ b/src/main/java/org/codelibs/fess/crawler/processor/FessResponseProcessor.java @@ -15,8 +15,6 @@ */ package org.codelibs.fess.crawler.processor; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.fess.crawler.entity.AccessResult; @@ -27,6 +25,8 @@ import org.codelibs.fess.ingest.Ingester; import org.codelibs.fess.util.ComponentUtil; +import jakarta.annotation.PostConstruct; + public class FessResponseProcessor extends DefaultResponseProcessor { private static final Logger logger = LogManager.getLogger(FessResponseProcessor.class); diff --git a/src/main/java/org/codelibs/fess/crawler/transformer/FessFileTransformer.java b/src/main/java/org/codelibs/fess/crawler/transformer/FessFileTransformer.java index 817a08f904..b1ae0bd50c 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/FessFileTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/FessFileTransformer.java @@ -15,8 +15,6 @@ */ package org.codelibs.fess.crawler.transformer; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.fess.crawler.entity.ResponseData; @@ -26,6 +24,8 @@ import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.util.ComponentUtil; +import jakarta.annotation.PostConstruct; + public class FessFileTransformer extends AbstractFessFileTransformer { private static final Logger logger = LogManager.getLogger(FessFileTransformer.class); diff --git a/src/main/java/org/codelibs/fess/crawler/transformer/FessStandardTransformer.java b/src/main/java/org/codelibs/fess/crawler/transformer/FessStandardTransformer.java index c2c87c4c40..8af862a0c6 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/FessStandardTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/FessStandardTransformer.java @@ -15,8 +15,6 @@ */ package org.codelibs.fess.crawler.transformer; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.fess.crawler.entity.ResponseData; @@ -26,6 +24,8 @@ import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.util.ComponentUtil; +import jakarta.annotation.PostConstruct; + public class FessStandardTransformer extends AbstractFessFileTransformer { private static final Logger logger = LogManager.getLogger(FessStandardTransformer.class); 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 09ca15bb1d..3cf69c7576 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java @@ -33,7 +33,6 @@ import java.util.function.UnaryOperator; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; import javax.xml.xpath.XPathEvaluationResult; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathNodes; @@ -78,6 +77,8 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; +import jakarta.annotation.PostConstruct; + public class FessXpathTransformer extends XpathTransformer implements FessTransformer { private static final Logger logger = LogManager.getLogger(FessXpathTransformer.class); diff --git a/src/main/java/org/codelibs/fess/dict/DictionaryCreator.java b/src/main/java/org/codelibs/fess/dict/DictionaryCreator.java index 51cc5107e2..54076f784a 100644 --- a/src/main/java/org/codelibs/fess/dict/DictionaryCreator.java +++ b/src/main/java/org/codelibs/fess/dict/DictionaryCreator.java @@ -19,10 +19,10 @@ import java.util.Date; import java.util.regex.Pattern; -import javax.annotation.Resource; - import org.codelibs.fess.Constants; +import jakarta.annotation.Resource; + public abstract class DictionaryCreator { protected Pattern pattern; diff --git a/src/main/java/org/codelibs/fess/dict/DictionaryManager.java b/src/main/java/org/codelibs/fess/dict/DictionaryManager.java index b7237032b9..4ee8a68067 100644 --- a/src/main/java/org/codelibs/fess/dict/DictionaryManager.java +++ b/src/main/java/org/codelibs/fess/dict/DictionaryManager.java @@ -23,8 +23,6 @@ import java.util.List; import java.util.Map; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.io.FileUtil; @@ -34,6 +32,8 @@ import org.codelibs.opensearch.runner.net.OpenSearchCurl; import org.dbflute.optional.OptionalEntity; +import jakarta.annotation.PostConstruct; + public class DictionaryManager { private static final Logger logger = LogManager.getLogger(DictionaryManager.class); diff --git a/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiCreator.java b/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiCreator.java index c7c9201622..12bea3a970 100644 --- a/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiCreator.java +++ b/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiCreator.java @@ -17,14 +17,14 @@ import java.util.Date; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.fess.dict.DictionaryCreator; import org.codelibs.fess.dict.DictionaryFile; import org.codelibs.fess.dict.DictionaryItem; +import jakarta.annotation.PostConstruct; + public class KuromojiCreator extends DictionaryCreator { private static final Logger logger = LogManager.getLogger(KuromojiCreator.class); diff --git a/src/main/java/org/codelibs/fess/dict/mapping/CharMappingCreator.java b/src/main/java/org/codelibs/fess/dict/mapping/CharMappingCreator.java index 6fae65799f..63ad781f45 100644 --- a/src/main/java/org/codelibs/fess/dict/mapping/CharMappingCreator.java +++ b/src/main/java/org/codelibs/fess/dict/mapping/CharMappingCreator.java @@ -17,14 +17,14 @@ import java.util.Date; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.fess.dict.DictionaryCreator; import org.codelibs.fess.dict.DictionaryFile; import org.codelibs.fess.dict.DictionaryItem; +import jakarta.annotation.PostConstruct; + public class CharMappingCreator extends DictionaryCreator { private static final Logger logger = LogManager.getLogger(CharMappingCreator.class); diff --git a/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsCreator.java b/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsCreator.java index 78904eb80e..e57161eab6 100644 --- a/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsCreator.java +++ b/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsCreator.java @@ -17,14 +17,14 @@ import java.util.Date; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.fess.dict.DictionaryCreator; import org.codelibs.fess.dict.DictionaryFile; import org.codelibs.fess.dict.DictionaryItem; +import jakarta.annotation.PostConstruct; + public class ProtwordsCreator extends DictionaryCreator { private static final Logger logger = LogManager.getLogger(ProtwordsCreator.class); diff --git a/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideCreator.java b/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideCreator.java index debf447855..c1ecb30dd6 100644 --- a/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideCreator.java +++ b/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideCreator.java @@ -17,14 +17,14 @@ import java.util.Date; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.fess.dict.DictionaryCreator; import org.codelibs.fess.dict.DictionaryFile; import org.codelibs.fess.dict.DictionaryItem; +import jakarta.annotation.PostConstruct; + public class StemmerOverrideCreator extends DictionaryCreator { private static final Logger logger = LogManager.getLogger(StemmerOverrideCreator.class); diff --git a/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsCreator.java b/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsCreator.java index 8f84b1dc0e..90e9116b43 100644 --- a/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsCreator.java +++ b/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsCreator.java @@ -17,14 +17,14 @@ import java.util.Date; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.fess.dict.DictionaryCreator; import org.codelibs.fess.dict.DictionaryFile; import org.codelibs.fess.dict.DictionaryItem; +import jakarta.annotation.PostConstruct; + public class StopwordsCreator extends DictionaryCreator { private static final Logger logger = LogManager.getLogger(StopwordsCreator.class); diff --git a/src/main/java/org/codelibs/fess/dict/synonym/SynonymCreator.java b/src/main/java/org/codelibs/fess/dict/synonym/SynonymCreator.java index ba2d20baea..4867cdaa33 100644 --- a/src/main/java/org/codelibs/fess/dict/synonym/SynonymCreator.java +++ b/src/main/java/org/codelibs/fess/dict/synonym/SynonymCreator.java @@ -17,14 +17,14 @@ import java.util.Date; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.fess.dict.DictionaryCreator; import org.codelibs.fess.dict.DictionaryFile; import org.codelibs.fess.dict.DictionaryItem; +import jakarta.annotation.PostConstruct; + public class SynonymCreator extends DictionaryCreator { private static final Logger logger = LogManager.getLogger(SynonymCreator.class); diff --git a/src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallbackImpl.java b/src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallbackImpl.java index f34b889d4a..1cc5d1b77b 100644 --- a/src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallbackImpl.java +++ b/src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallbackImpl.java @@ -20,8 +20,6 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicLong; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.stream.StreamUtil; @@ -40,6 +38,8 @@ import org.codelibs.fess.util.DocumentUtil; import org.codelibs.fess.util.MemoryUtil; +import jakarta.annotation.PostConstruct; + public class IndexUpdateCallbackImpl implements IndexUpdateCallback { private static final Logger logger = LogManager.getLogger(IndexUpdateCallbackImpl.class); diff --git a/src/main/java/org/codelibs/fess/entity/FacetInfo.java b/src/main/java/org/codelibs/fess/entity/FacetInfo.java index 4c3cbde4ba..a8ccc9935b 100644 --- a/src/main/java/org/codelibs/fess/entity/FacetInfo.java +++ b/src/main/java/org/codelibs/fess/entity/FacetInfo.java @@ -17,8 +17,6 @@ import java.util.Arrays; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -27,6 +25,8 @@ import org.codelibs.fess.util.ComponentUtil; import org.opensearch.search.aggregations.BucketOrder; +import jakarta.annotation.PostConstruct; + public class FacetInfo { private static final Logger logger = LogManager.getLogger(FacetInfo.class); diff --git a/src/main/java/org/codelibs/fess/entity/FacetQueryView.java b/src/main/java/org/codelibs/fess/entity/FacetQueryView.java index 7404bfaf82..f67400ef80 100644 --- a/src/main/java/org/codelibs/fess/entity/FacetQueryView.java +++ b/src/main/java/org/codelibs/fess/entity/FacetQueryView.java @@ -21,12 +21,12 @@ import java.util.Map; import java.util.ResourceBundle; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.fess.util.ComponentUtil; +import jakarta.annotation.PostConstruct; + public class FacetQueryView { private static final Logger logger = LogManager.getLogger(FacetQueryView.class); diff --git a/src/main/java/org/codelibs/fess/entity/GeoInfo.java b/src/main/java/org/codelibs/fess/entity/GeoInfo.java index 4cb9216243..e8c57e645b 100644 --- a/src/main/java/org/codelibs/fess/entity/GeoInfo.java +++ b/src/main/java/org/codelibs/fess/entity/GeoInfo.java @@ -20,8 +20,6 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; - import org.codelibs.core.lang.StringUtil; import org.codelibs.core.stream.StreamUtil; import org.codelibs.fess.exception.InvalidQueryException; @@ -32,6 +30,8 @@ import org.opensearch.index.query.QueryBuilder; import org.opensearch.index.query.QueryBuilders; +import jakarta.servlet.http.HttpServletRequest; + public class GeoInfo { private QueryBuilder builder; diff --git a/src/main/java/org/codelibs/fess/entity/SearchRequestParams.java b/src/main/java/org/codelibs/fess/entity/SearchRequestParams.java index 25fd451337..d1491f2493 100644 --- a/src/main/java/org/codelibs/fess/entity/SearchRequestParams.java +++ b/src/main/java/org/codelibs/fess/entity/SearchRequestParams.java @@ -20,11 +20,11 @@ import java.util.Locale; import java.util.Map; -import javax.servlet.http.HttpServletRequest; - import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.util.ComponentUtil; +import jakarta.servlet.http.HttpServletRequest; + public abstract class SearchRequestParams { public static final String AS_NQ = "nq"; diff --git a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java b/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java index a8815bd2fc..24e10e5908 100644 --- a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java +++ b/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java @@ -41,9 +41,6 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.beans.util.BeanUtil; @@ -182,6 +179,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.io.BaseEncoding; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; + public class SearchEngineClient implements Client { private static final Logger logger = LogManager.getLogger(SearchEngineClient.class); diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java index 442425525c..ecec84de2a 100644 --- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java +++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java @@ -25,8 +25,6 @@ import java.util.Map; import java.util.function.Function; -import javax.annotation.Resource; - import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.DocMeta; import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall; import org.dbflute.Entity; @@ -59,6 +57,8 @@ import org.opensearch.search.SearchHit; import org.opensearch.search.SearchHits; +import jakarta.annotation.Resource; + /** * @param The type of entity. * @param The type of condition-bean. diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java index 290b154b4c..1de5104193 100644 --- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java +++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java @@ -25,8 +25,6 @@ import java.util.Map; import java.util.function.Function; -import javax.annotation.Resource; - import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.DocMeta; import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.RequestOptionCall; import org.dbflute.Entity; @@ -59,6 +57,8 @@ import org.opensearch.search.SearchHit; import org.opensearch.search.SearchHits; +import jakarta.annotation.Resource; + /** * @param The type of entity. * @param The type of condition-bean. diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java index a67eaae70e..91a5c213af 100644 --- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java +++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java @@ -25,8 +25,6 @@ import java.util.Map; import java.util.function.Function; -import javax.annotation.Resource; - import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.DocMeta; import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.RequestOptionCall; import org.dbflute.Entity; @@ -59,6 +57,8 @@ import org.opensearch.search.SearchHit; import org.opensearch.search.SearchHits; +import jakarta.annotation.Resource; + /** * @param The type of entity. * @param The type of condition-bean. diff --git a/src/main/java/org/codelibs/fess/exception/ServletRuntimeException.java b/src/main/java/org/codelibs/fess/exception/ServletRuntimeException.java index e1e5ccb7a5..cb3db6b965 100644 --- a/src/main/java/org/codelibs/fess/exception/ServletRuntimeException.java +++ b/src/main/java/org/codelibs/fess/exception/ServletRuntimeException.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.exception; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; public class ServletRuntimeException extends RuntimeException { diff --git a/src/main/java/org/codelibs/fess/exec/Crawler.java b/src/main/java/org/codelibs/fess/exec/Crawler.java index b5496e22b5..e3d9e60116 100644 --- a/src/main/java/org/codelibs/fess/exec/Crawler.java +++ b/src/main/java/org/codelibs/fess/exec/Crawler.java @@ -34,8 +34,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import javax.annotation.Resource; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.CoreLibConstants; @@ -76,6 +74,8 @@ import org.opensearch.monitor.os.OsProbe; import org.opensearch.monitor.process.ProcessProbe; +import jakarta.annotation.Resource; + public class Crawler { private static final Logger logger = LogManager.getLogger(Crawler.class); diff --git a/src/main/java/org/codelibs/fess/exec/SuggestCreator.java b/src/main/java/org/codelibs/fess/exec/SuggestCreator.java index 6ec474725f..5d2f44283f 100644 --- a/src/main/java/org/codelibs/fess/exec/SuggestCreator.java +++ b/src/main/java/org/codelibs/fess/exec/SuggestCreator.java @@ -21,8 +21,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.Resource; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -47,6 +45,8 @@ import org.opensearch.monitor.os.OsProbe; import org.opensearch.monitor.process.ProcessProbe; +import jakarta.annotation.Resource; + public class SuggestCreator { private static final Logger logger = LogManager.getLogger(SuggestCreator.class); diff --git a/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java b/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java index 4a89c80678..b2bf310898 100644 --- a/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java +++ b/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java @@ -21,8 +21,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import javax.annotation.Resource; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -46,6 +44,8 @@ import org.opensearch.monitor.os.OsProbe; import org.opensearch.monitor.process.ProcessProbe; +import jakarta.annotation.Resource; + public class ThumbnailGenerator { private static final Logger logger = LogManager.getLogger(ThumbnailGenerator.class); diff --git a/src/main/java/org/codelibs/fess/filter/CorsFilter.java b/src/main/java/org/codelibs/fess/filter/CorsFilter.java index fd3a2187e9..b0e2a1da64 100644 --- a/src/main/java/org/codelibs/fess/filter/CorsFilter.java +++ b/src/main/java/org/codelibs/fess/filter/CorsFilter.java @@ -17,14 +17,6 @@ import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -32,6 +24,14 @@ import org.codelibs.fess.cors.CorsHandlerFactory; import org.codelibs.fess.util.ComponentUtil; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + public class CorsFilter implements Filter { private static final Logger logger = LogManager.getLogger(CorsFilter.class); diff --git a/src/main/java/org/codelibs/fess/filter/EncodingFilter.java b/src/main/java/org/codelibs/fess/filter/EncodingFilter.java index cfcee1b583..67b6f2c7a7 100644 --- a/src/main/java/org/codelibs/fess/filter/EncodingFilter.java +++ b/src/main/java/org/codelibs/fess/filter/EncodingFilter.java @@ -23,21 +23,21 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.net.URLCodec; import org.codelibs.core.lang.StringUtil; import org.lastaflute.web.servlet.filter.LastaPrepareFilter; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + public class EncodingFilter implements Filter { public static final String ENCODING_MAP = "encodingRules"; diff --git a/src/main/java/org/codelibs/fess/filter/WebApiFilter.java b/src/main/java/org/codelibs/fess/filter/WebApiFilter.java index 219c6cefe4..850641e412 100644 --- a/src/main/java/org/codelibs/fess/filter/WebApiFilter.java +++ b/src/main/java/org/codelibs/fess/filter/WebApiFilter.java @@ -17,19 +17,19 @@ import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.codelibs.fess.api.WebApiManager; import org.codelibs.fess.api.WebApiManagerFactory; import org.codelibs.fess.util.ComponentUtil; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + public class WebApiFilter implements Filter { @Override diff --git a/src/main/java/org/codelibs/fess/helper/AccessTokenHelper.java b/src/main/java/org/codelibs/fess/helper/AccessTokenHelper.java index ad4aa465c0..d32148c11e 100644 --- a/src/main/java/org/codelibs/fess/helper/AccessTokenHelper.java +++ b/src/main/java/org/codelibs/fess/helper/AccessTokenHelper.java @@ -18,13 +18,13 @@ import java.security.SecureRandom; import java.util.Random; -import javax.servlet.http.HttpServletRequest; - import org.apache.commons.lang3.RandomStringUtils; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.exception.InvalidAccessTokenException; import org.codelibs.fess.util.ComponentUtil; +import jakarta.servlet.http.HttpServletRequest; + public class AccessTokenHelper { protected Random random = new SecureRandom(); diff --git a/src/main/java/org/codelibs/fess/helper/ActivityHelper.java b/src/main/java/org/codelibs/fess/helper/ActivityHelper.java index 1a332d8206..50f75bc5ac 100644 --- a/src/main/java/org/codelibs/fess/helper/ActivityHelper.java +++ b/src/main/java/org/codelibs/fess/helper/ActivityHelper.java @@ -25,8 +25,6 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; - import org.apache.commons.text.StringEscapeUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -38,6 +36,8 @@ import org.lastaflute.web.login.credential.LoginCredential; import org.lastaflute.web.util.LaRequestUtil; +import jakarta.annotation.PostConstruct; + /** * @author shinsuke * diff --git a/src/main/java/org/codelibs/fess/helper/CrawlerStatsHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlerStatsHelper.java index 631b6ddcdd..9ccaeb3edb 100644 --- a/src/main/java/org/codelibs/fess/helper/CrawlerStatsHelper.java +++ b/src/main/java/org/codelibs/fess/helper/CrawlerStatsHelper.java @@ -21,9 +21,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.fess.crawler.entity.UrlQueue; @@ -34,6 +31,9 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; + /** * @author shinsuke * diff --git a/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java index 4226cc257a..d8194c6b46 100644 --- a/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java +++ b/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java @@ -24,8 +24,6 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -54,6 +52,8 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; +import jakarta.annotation.PostConstruct; + public class CrawlingConfigHelper { private static final Logger logger = LogManager.getLogger(CrawlingConfigHelper.class); diff --git a/src/main/java/org/codelibs/fess/helper/CurlHelper.java b/src/main/java/org/codelibs/fess/helper/CurlHelper.java index 772a4400a4..3636f4c8b7 100644 --- a/src/main/java/org/codelibs/fess/helper/CurlHelper.java +++ b/src/main/java/org/codelibs/fess/helper/CurlHelper.java @@ -24,7 +24,6 @@ import java.security.cert.Certificate; import java.security.cert.CertificateFactory; -import javax.annotation.PostConstruct; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManagerFactory; @@ -40,6 +39,8 @@ import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.util.ResourceUtil; +import jakarta.annotation.PostConstruct; + public class CurlHelper { private static final Logger logger = LogManager.getLogger(CurlHelper.class); diff --git a/src/main/java/org/codelibs/fess/helper/DocumentHelper.java b/src/main/java/org/codelibs/fess/helper/DocumentHelper.java index b0346a3c2c..1d67e872a2 100644 --- a/src/main/java/org/codelibs/fess/helper/DocumentHelper.java +++ b/src/main/java/org/codelibs/fess/helper/DocumentHelper.java @@ -29,8 +29,6 @@ import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import javax.annotation.PostConstruct; - import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -63,6 +61,8 @@ import org.lastaflute.di.core.SingletonLaContainer; import org.lastaflute.di.core.exception.ComponentNotFoundException; +import jakarta.annotation.PostConstruct; + public class DocumentHelper { private static final Logger logger = LogManager.getLogger(DocumentHelper.class); diff --git a/src/main/java/org/codelibs/fess/helper/DuplicateHostHelper.java b/src/main/java/org/codelibs/fess/helper/DuplicateHostHelper.java index 91e90f62e7..930909c123 100644 --- a/src/main/java/org/codelibs/fess/helper/DuplicateHostHelper.java +++ b/src/main/java/org/codelibs/fess/helper/DuplicateHostHelper.java @@ -18,14 +18,14 @@ import java.util.ArrayList; import java.util.List; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.fess.app.service.DuplicateHostService; import org.codelibs.fess.es.config.exentity.DuplicateHost; import org.codelibs.fess.util.ComponentUtil; +import jakarta.annotation.PostConstruct; + public class DuplicateHostHelper { private static final Logger logger = LogManager.getLogger(DuplicateHostHelper.class); diff --git a/src/main/java/org/codelibs/fess/helper/FileTypeHelper.java b/src/main/java/org/codelibs/fess/helper/FileTypeHelper.java index f8c4af8ab1..15ae030749 100644 --- a/src/main/java/org/codelibs/fess/helper/FileTypeHelper.java +++ b/src/main/java/org/codelibs/fess/helper/FileTypeHelper.java @@ -18,8 +18,6 @@ import java.util.LinkedHashMap; import java.util.Map; -import javax.annotation.PostConstruct; - import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -27,6 +25,8 @@ import org.codelibs.core.stream.StreamUtil; import org.codelibs.fess.util.ComponentUtil; +import jakarta.annotation.PostConstruct; + public class FileTypeHelper { private static final Logger logger = LogManager.getLogger(FileTypeHelper.class); diff --git a/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java b/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java index d91af51362..4d21f42a0f 100644 --- a/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java +++ b/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java @@ -22,8 +22,6 @@ import java.util.Locale; import java.util.Map; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -44,6 +42,8 @@ import org.opensearch.index.query.functionscore.ScoreFunctionBuilder; import org.opensearch.index.query.functionscore.ScoreFunctionBuilders; +import jakarta.annotation.PostConstruct; + public class KeyMatchHelper extends AbstractConfigHelper { private static final Logger logger = LogManager.getLogger(KeyMatchHelper.class); diff --git a/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java b/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java index 302e3a9716..899a250d61 100644 --- a/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java +++ b/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java @@ -28,8 +28,6 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -39,6 +37,8 @@ import org.codelibs.fess.es.config.exentity.LabelType; import org.codelibs.fess.util.ComponentUtil; +import jakarta.annotation.PostConstruct; + public class LabelTypeHelper extends AbstractConfigHelper { private static final Logger logger = LogManager.getLogger(LabelTypeHelper.class); diff --git a/src/main/java/org/codelibs/fess/helper/LanguageHelper.java b/src/main/java/org/codelibs/fess/helper/LanguageHelper.java index d2749749b1..1956be7487 100644 --- a/src/main/java/org/codelibs/fess/helper/LanguageHelper.java +++ b/src/main/java/org/codelibs/fess/helper/LanguageHelper.java @@ -19,8 +19,6 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.tika.language.detect.LanguageDetector; @@ -31,6 +29,8 @@ import org.codelibs.fess.util.DocumentUtil; import org.opensearch.script.Script; +import jakarta.annotation.PostConstruct; + public class LanguageHelper { private static final Logger logger = LogManager.getLogger(LanguageHelper.class); diff --git a/src/main/java/org/codelibs/fess/helper/OsddHelper.java b/src/main/java/org/codelibs/fess/helper/OsddHelper.java index cb321651cb..90ca1b3e72 100644 --- a/src/main/java/org/codelibs/fess/helper/OsddHelper.java +++ b/src/main/java/org/codelibs/fess/helper/OsddHelper.java @@ -19,8 +19,6 @@ import java.io.FileInputStream; import java.io.InputStream; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -29,6 +27,8 @@ import org.lastaflute.web.response.StreamResponse; import org.lastaflute.web.util.LaServletContextUtil; +import jakarta.annotation.PostConstruct; + /** * Helper class for Open Search Description Document. * diff --git a/src/main/java/org/codelibs/fess/helper/PathMappingHelper.java b/src/main/java/org/codelibs/fess/helper/PathMappingHelper.java index bfae3e9b79..7f031163ae 100644 --- a/src/main/java/org/codelibs/fess/helper/PathMappingHelper.java +++ b/src/main/java/org/codelibs/fess/helper/PathMappingHelper.java @@ -22,8 +22,6 @@ import java.util.function.BiFunction; import java.util.regex.Matcher; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -36,6 +34,8 @@ import org.lastaflute.di.core.factory.SingletonLaContainerFactory; import org.lastaflute.web.util.LaRequestUtil; +import jakarta.annotation.PostConstruct; + public class PathMappingHelper extends AbstractConfigHelper { private static final Logger logger = LogManager.getLogger(PathMappingHelper.class); diff --git a/src/main/java/org/codelibs/fess/helper/PermissionHelper.java b/src/main/java/org/codelibs/fess/helper/PermissionHelper.java index 726c246937..eae17fec55 100644 --- a/src/main/java/org/codelibs/fess/helper/PermissionHelper.java +++ b/src/main/java/org/codelibs/fess/helper/PermissionHelper.java @@ -26,8 +26,6 @@ import java.util.Locale; import java.util.Map; -import javax.annotation.Resource; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -39,6 +37,7 @@ import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.util.ComponentUtil; +import jakarta.annotation.Resource; import jcifs.SID; public class PermissionHelper { diff --git a/src/main/java/org/codelibs/fess/helper/PopularWordHelper.java b/src/main/java/org/codelibs/fess/helper/PopularWordHelper.java index d6f09505f8..1f79405084 100644 --- a/src/main/java/org/codelibs/fess/helper/PopularWordHelper.java +++ b/src/main/java/org/codelibs/fess/helper/PopularWordHelper.java @@ -23,8 +23,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -37,6 +35,8 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; +import jakarta.annotation.PostConstruct; + public class PopularWordHelper { private static final Logger logger = LogManager.getLogger(PopularWordHelper.class); diff --git a/src/main/java/org/codelibs/fess/helper/ProcessHelper.java b/src/main/java/org/codelibs/fess/helper/ProcessHelper.java index 43b3ad31ea..4a98d0380d 100644 --- a/src/main/java/org/codelibs/fess/helper/ProcessHelper.java +++ b/src/main/java/org/codelibs/fess/helper/ProcessHelper.java @@ -24,8 +24,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import javax.annotation.PreDestroy; - import org.apache.commons.io.IOUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -36,6 +34,8 @@ import org.codelibs.fess.util.InputStreamThread; import org.codelibs.fess.util.JobProcess; +import jakarta.annotation.PreDestroy; + public class ProcessHelper { private static final Logger logger = LogManager.getLogger(ProcessHelper.class); diff --git a/src/main/java/org/codelibs/fess/helper/QueryHelper.java b/src/main/java/org/codelibs/fess/helper/QueryHelper.java index e749de9624..a2aa5a572c 100644 --- a/src/main/java/org/codelibs/fess/helper/QueryHelper.java +++ b/src/main/java/org/codelibs/fess/helper/QueryHelper.java @@ -25,9 +25,6 @@ import java.util.UUID; import java.util.function.Consumer; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.search.Query; @@ -60,6 +57,9 @@ import org.opensearch.search.sort.SortBuilders; import org.opensearch.search.sort.SortOrder; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; + public class QueryHelper { private static final Logger logger = LogManager.getLogger(QueryHelper.class); diff --git a/src/main/java/org/codelibs/fess/helper/RelatedContentHelper.java b/src/main/java/org/codelibs/fess/helper/RelatedContentHelper.java index e6c869dc02..436a228250 100644 --- a/src/main/java/org/codelibs/fess/helper/RelatedContentHelper.java +++ b/src/main/java/org/codelibs/fess/helper/RelatedContentHelper.java @@ -23,8 +23,6 @@ import java.util.Map; import java.util.regex.Pattern; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -33,6 +31,8 @@ import org.codelibs.fess.es.config.exentity.RelatedContent; import org.codelibs.fess.util.ComponentUtil; +import jakarta.annotation.PostConstruct; + public class RelatedContentHelper extends AbstractConfigHelper { private static final Logger logger = LogManager.getLogger(RelatedContentHelper.class); diff --git a/src/main/java/org/codelibs/fess/helper/RelatedQueryHelper.java b/src/main/java/org/codelibs/fess/helper/RelatedQueryHelper.java index afa294ccc2..b4c67a9900 100644 --- a/src/main/java/org/codelibs/fess/helper/RelatedQueryHelper.java +++ b/src/main/java/org/codelibs/fess/helper/RelatedQueryHelper.java @@ -21,8 +21,6 @@ import java.util.Locale; import java.util.Map; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -30,6 +28,8 @@ import org.codelibs.fess.es.config.exentity.RelatedQuery; import org.codelibs.fess.util.ComponentUtil; +import jakarta.annotation.PostConstruct; + public class RelatedQueryHelper extends AbstractConfigHelper { private static final Logger logger = LogManager.getLogger(RelatedQueryHelper.class); diff --git a/src/main/java/org/codelibs/fess/helper/RoleQueryHelper.java b/src/main/java/org/codelibs/fess/helper/RoleQueryHelper.java index 8293ec58f6..3095c1cf42 100644 --- a/src/main/java/org/codelibs/fess/helper/RoleQueryHelper.java +++ b/src/main/java/org/codelibs/fess/helper/RoleQueryHelper.java @@ -24,10 +24,6 @@ import java.util.Map; import java.util.Set; -import javax.annotation.PostConstruct; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.crypto.CachedCipher; @@ -42,6 +38,10 @@ import org.lastaflute.web.servlet.request.RequestManager; import org.lastaflute.web.util.LaRequestUtil; +import jakarta.annotation.PostConstruct; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; + /** * This class returns a list of a role from a request parameter, * a request header and a cookie. The format of the default value diff --git a/src/main/java/org/codelibs/fess/helper/SambaHelper.java b/src/main/java/org/codelibs/fess/helper/SambaHelper.java index 5ea42bf7ba..ef60cc642f 100644 --- a/src/main/java/org/codelibs/fess/helper/SambaHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SambaHelper.java @@ -15,13 +15,12 @@ */ package org.codelibs.fess.helper; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.util.ComponentUtil; +import jakarta.annotation.PostConstruct; import jcifs.SID; public class SambaHelper { diff --git a/src/main/java/org/codelibs/fess/helper/SearchHelper.java b/src/main/java/org/codelibs/fess/helper/SearchHelper.java index ea782c3db4..10a5b7f912 100644 --- a/src/main/java/org/codelibs/fess/helper/SearchHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SearchHelper.java @@ -28,8 +28,6 @@ import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.exception.InterruptedRuntimeException; @@ -63,6 +61,8 @@ import org.opensearch.index.query.BoolQueryBuilder; import org.opensearch.index.query.QueryBuilders; +import jakarta.servlet.http.HttpServletRequest; + public class SearchHelper { // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java index b03272cdfe..db79677959 100644 --- a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java @@ -31,8 +31,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; - import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -67,6 +65,8 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import jakarta.annotation.PostConstruct; + public class SearchLogHelper { private static final Logger logger = LogManager.getLogger(SearchLogHelper.class); diff --git a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java index 171d8113fc..a9de11a3f0 100644 --- a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java @@ -31,8 +31,6 @@ import java.util.Set; import java.util.function.Consumer; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -64,6 +62,8 @@ import org.opensearch.index.query.functionscore.ScoreFunctionBuilders; import org.opensearch.search.sort.SortBuilders; +import jakarta.annotation.PostConstruct; + public class SuggestHelper { private static final Logger logger = LogManager.getLogger(SuggestHelper.class); diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java index 20697e04b0..141bd0fba4 100644 --- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java @@ -48,10 +48,6 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.servlet.ServletContext; - import org.apache.commons.lang3.LocaleUtils; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.Level; @@ -87,6 +83,10 @@ import com.google.common.cache.LoadingCache; import com.ibm.icu.util.ULocale; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.servlet.ServletContext; + public class SystemHelper { private static final Logger logger = LogManager.getLogger(SystemHelper.class); diff --git a/src/main/java/org/codelibs/fess/helper/UserInfoHelper.java b/src/main/java/org/codelibs/fess/helper/UserInfoHelper.java index a16cf8d752..fc199c2cb3 100644 --- a/src/main/java/org/codelibs/fess/helper/UserInfoHelper.java +++ b/src/main/java/org/codelibs/fess/helper/UserInfoHelper.java @@ -20,10 +20,6 @@ import java.util.Map; import java.util.UUID; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - import org.codelibs.core.collection.LruHashMap; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -35,6 +31,10 @@ import org.lastaflute.web.util.LaRequestUtil; import org.lastaflute.web.util.LaResponseUtil; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; + public class UserInfoHelper { protected static final String USER_BEAN = "lastaflute.action.USER_BEAN.FessUserBean"; diff --git a/src/main/java/org/codelibs/fess/helper/ViewHelper.java b/src/main/java/org/codelibs/fess/helper/ViewHelper.java index 76bf1a9cbf..c3a2c89df2 100644 --- a/src/main/java/org/codelibs/fess/helper/ViewHelper.java +++ b/src/main/java/org/codelibs/fess/helper/ViewHelper.java @@ -41,12 +41,6 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.servlet.ServletContext; -import javax.servlet.SessionTrackingMode; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - import org.apache.catalina.connector.ClientAbortException; import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.StringEscapeUtils; @@ -95,6 +89,12 @@ import com.google.common.cache.CacheBuilder; import com.ibm.icu.text.SimpleDateFormat; +import jakarta.annotation.PostConstruct; +import jakarta.servlet.ServletContext; +import jakarta.servlet.SessionTrackingMode; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; + public class ViewHelper { private static final Logger logger = LogManager.getLogger(ViewHelper.class); diff --git a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java index 77ab7cecf7..e6205d072f 100644 --- a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java +++ b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java @@ -20,10 +20,6 @@ import java.util.Map; import java.util.function.Consumer; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.annotation.Resource; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -61,6 +57,10 @@ import org.opensearch.index.query.QueryBuilders; import org.opensearch.search.sort.SortOrder; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.annotation.Resource; + public class IndexUpdater extends Thread { private static final Logger logger = LogManager.getLogger(IndexUpdater.class); diff --git a/src/main/java/org/codelibs/fess/job/CrawlJob.java b/src/main/java/org/codelibs/fess/job/CrawlJob.java index 9e379dfc7a..a2fbc461d8 100644 --- a/src/main/java/org/codelibs/fess/job/CrawlJob.java +++ b/src/main/java/org/codelibs/fess/job/CrawlJob.java @@ -24,8 +24,6 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import javax.servlet.ServletContext; - import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.SystemUtils; import org.apache.logging.log4j.LogManager; @@ -45,6 +43,8 @@ import org.codelibs.fess.util.ResourceUtil; import org.codelibs.fess.util.SystemUtil; +import jakarta.servlet.ServletContext; + public class CrawlJob extends ExecJob { private static final Logger logger = LogManager.getLogger(CrawlJob.class); diff --git a/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java b/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java index c4fc9c8572..6cc2789ba9 100644 --- a/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java +++ b/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java @@ -21,8 +21,6 @@ import java.util.ArrayList; import java.util.List; -import javax.servlet.ServletContext; - import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.SystemUtils; import org.apache.logging.log4j.LogManager; @@ -40,6 +38,8 @@ import org.codelibs.fess.util.ResourceUtil; import org.codelibs.fess.util.SystemUtil; +import jakarta.servlet.ServletContext; + public class GenerateThumbnailJob extends ExecJob { static final Logger logger = LogManager.getLogger(GenerateThumbnailJob.class); diff --git a/src/main/java/org/codelibs/fess/job/PythonJob.java b/src/main/java/org/codelibs/fess/job/PythonJob.java index 914dfe3542..0e75f65a66 100644 --- a/src/main/java/org/codelibs/fess/job/PythonJob.java +++ b/src/main/java/org/codelibs/fess/job/PythonJob.java @@ -22,8 +22,6 @@ import java.util.List; import java.util.Map; -import javax.servlet.ServletContext; - import org.apache.commons.lang3.RandomStringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -38,6 +36,8 @@ import org.codelibs.fess.util.JobProcess; import org.codelibs.fess.util.SystemUtil; +import jakarta.servlet.ServletContext; + public class PythonJob extends ExecJob { static final Logger logger = LogManager.getLogger(PythonJob.class); diff --git a/src/main/java/org/codelibs/fess/job/SuggestJob.java b/src/main/java/org/codelibs/fess/job/SuggestJob.java index fdb591cf88..62e3a2a159 100644 --- a/src/main/java/org/codelibs/fess/job/SuggestJob.java +++ b/src/main/java/org/codelibs/fess/job/SuggestJob.java @@ -21,8 +21,6 @@ import java.util.ArrayList; import java.util.List; -import javax.servlet.ServletContext; - import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.SystemUtils; import org.apache.logging.log4j.LogManager; @@ -40,6 +38,8 @@ import org.codelibs.fess.util.ResourceUtil; import org.codelibs.fess.util.SystemUtil; +import jakarta.servlet.ServletContext; + public class SuggestJob extends ExecJob { private static final Logger logger = LogManager.getLogger(SuggestJob.class); diff --git a/src/main/java/org/codelibs/fess/ldap/LdapManager.java b/src/main/java/org/codelibs/fess/ldap/LdapManager.java index 6ace4239a5..e719991e0b 100644 --- a/src/main/java/org/codelibs/fess/ldap/LdapManager.java +++ b/src/main/java/org/codelibs/fess/ldap/LdapManager.java @@ -32,7 +32,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.PostConstruct; import javax.naming.Context; import javax.naming.NamingException; import javax.naming.directory.Attribute; @@ -63,6 +62,8 @@ import org.dbflute.optional.OptionalEntity; import org.dbflute.util.DfTypeUtil; +import jakarta.annotation.PostConstruct; + public class LdapManager { private static final Logger logger = LogManager.getLogger(LdapManager.class); diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessFwAssistantDirector.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessFwAssistantDirector.java index 649c489238..dc67e1382e 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessFwAssistantDirector.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessFwAssistantDirector.java @@ -18,8 +18,6 @@ import java.util.List; import java.util.function.Consumer; -import javax.annotation.Resource; - import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.mylasta.direction.sponsor.FessActionAdjustmentProvider; import org.codelibs.fess.mylasta.direction.sponsor.FessApiFailureHook; @@ -45,6 +43,8 @@ import org.lastaflute.web.ruts.process.ActionRuntime; import org.lastaflute.web.ruts.renderer.JspHtmlRenderingProvider; +import jakarta.annotation.Resource; + /** * @author jflute */ diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java index 77ad3db465..d84d67dc89 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java @@ -19,23 +19,23 @@ import java.io.IOException; import java.io.InputStream; import java.io.Serializable; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.Hashtable; import java.util.List; import java.util.Map; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileUploadBase.SizeLimitExceededException; -import org.apache.commons.fileupload.FileUploadException; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.apache.commons.fileupload.servlet.ServletFileUpload; +import org.apache.commons.fileupload2.core.DiskFileItem; +import org.apache.commons.fileupload2.core.DiskFileItemFactory; +import org.apache.commons.fileupload2.core.FileUploadByteCountLimitException; +import org.apache.commons.fileupload2.core.FileUploadException; +import org.apache.commons.fileupload2.jakarta.JakartaServletDiskFileUpload; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.fess.util.ComponentUtil; import org.dbflute.helper.message.ExceptionMessageBuilder; import org.lastaflute.core.message.UserMessages; +import org.lastaflute.di.exception.IORuntimeException; import org.lastaflute.web.LastaWebKey; import org.lastaflute.web.exception.Forced404NotFoundException; import org.lastaflute.web.ruts.config.ModuleConfig; @@ -45,6 +45,9 @@ import org.lastaflute.web.ruts.multipart.exception.MultipartExceededException; import org.lastaflute.web.util.LaServletContextUtil; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; + /** * @author modified by jflute (originated in Seasar) */ @@ -54,7 +57,7 @@ public class FessMultipartRequestHandler implements MultipartRequestHandler { // Definition // ========== private static final Logger logger = LogManager.getLogger(FessMultipartRequestHandler.class); - protected static final String CONTEXT_TEMPDIR_KEY = "javax.servlet.context.tempdir"; + protected static final String CONTEXT_TEMPDIR_KEY = "jakarta.searvlet.context.tempdir"; protected static final String JAVA_IO_TMPDIR_KEY = "java.io.tmpdir"; // =================================================================================== @@ -74,12 +77,12 @@ public void handleRequest(final HttpServletRequest request) throws ServletExcept // basically for JVN#14876762 // thought not all problems are resolved however the main case is safety // - - - - - - - - - -/ - final ServletFileUpload upload = createServletFileUpload(request); + final JakartaServletDiskFileUpload upload = createServletFileUpload(request); prepareElementsHash(); try { - final List items = parseRequest(request, upload); + final List items = parseRequest(request, upload); mappingParameter(request, items); - } catch (final SizeLimitExceededException e) { + } catch (final FileUploadByteCountLimitException e) { handleSizeLimitExceededException(request, e); } catch (final FileUploadException e) { handleFileUploadException(e); @@ -93,18 +96,31 @@ protected ModuleConfig getModuleConfig(final HttpServletRequest request) { // =================================================================================== // Create ServletFileUpload // ======================== - protected ServletFileUpload createServletFileUpload(final HttpServletRequest request) { + protected JakartaServletDiskFileUpload createServletFileUpload(final HttpServletRequest request) { final DiskFileItemFactory fileItemFactory = createDiskFileItemFactory(); - final ServletFileUpload upload = newServletFileUpload(fileItemFactory); - upload.setHeaderEncoding(request.getCharacterEncoding()); + final JakartaServletDiskFileUpload upload = newServletFileUpload(fileItemFactory); + final Charset charset = getRequestCharset(request); + if (charset != null) { + upload.setHeaderCharset(charset); + } upload.setSizeMax(getSizeMax()); return upload; } - protected ServletFileUpload newServletFileUpload(final DiskFileItemFactory fileItemFactory) { - return new ServletFileUpload(fileItemFactory) { + protected Charset getRequestCharset(final HttpServletRequest request) { + final String characterEncoding = request.getCharacterEncoding(); + try { + return Charset.forName(characterEncoding); + } catch (Exception e) { + logger.warn("Invalid charset: {}", characterEncoding, e); + } + return null; + } + + protected JakartaServletDiskFileUpload newServletFileUpload(final DiskFileItemFactory fileItemFactory) { + return new JakartaServletDiskFileUpload(fileItemFactory) { @Override - protected byte[] getBoundary(final String contentType) { // for security + public byte[] getBoundary(final String contentType) { // for security final byte[] boundary = super.getBoundary(contentType); checkBoundarySize(contentType, boundary); return boundary; @@ -148,7 +164,7 @@ protected void throwTooLongBoundarySizeException(final String contentType, final protected DiskFileItemFactory createDiskFileItemFactory() { final File repository = createRepositoryFile(); - return new DiskFileItemFactory((int) getSizeThreshold(), repository); + return DiskFileItemFactory.builder().setFile(repository).setBufferSize(getSizeThreshold()).get(); } protected File createRepositoryFile() { @@ -164,13 +180,14 @@ protected void prepareElementsHash() { elementsAll = new Hashtable<>(); } - protected List parseRequest(final HttpServletRequest request, final ServletFileUpload upload) throws FileUploadException { + protected List parseRequest(final HttpServletRequest request, final JakartaServletDiskFileUpload upload) + throws FileUploadException { return upload.parseRequest(request); } - protected void mappingParameter(final HttpServletRequest request, final List items) { + protected void mappingParameter(final HttpServletRequest request, final List items) { showFieldLoggingTitle(); - for (final FileItem item : items) { + for (final DiskFileItem item : items) { if (item.isFormField()) { showFormFieldParameter(item); addTextParameter(request, item); @@ -191,21 +208,21 @@ protected void showFieldLoggingTitle() { } } - protected void showFormFieldParameter(final FileItem item) { + protected void showFormFieldParameter(final DiskFileItem item) { if (logger.isDebugEnabled()) { logger.debug("[param] {}={}", item.getFieldName(), item.getString()); } } - protected void showFileFieldParameter(final FileItem item) { + protected void showFileFieldParameter(final DiskFileItem item) { if (logger.isDebugEnabled()) { logger.debug("[param] {}:{name={}, size={}}", item.getFieldName(), item.getName(), item.getSize()); } } - protected void handleSizeLimitExceededException(final HttpServletRequest request, final SizeLimitExceededException e) { + protected void handleSizeLimitExceededException(final HttpServletRequest request, final FileUploadByteCountLimitException e) { final long actual = e.getActualSize(); - final long permitted = e.getPermittedSize(); + final long permitted = e.getPermitted(); final String msg = "Exceeded size of the multipart request: actual=" + actual + " permitted=" + permitted; request.setAttribute(MAX_LENGTH_EXCEEDED_KEY, new MultipartExceededException(msg, actual, permitted, e)); try { @@ -233,16 +250,20 @@ protected void handleFileUploadException(final FileUploadException e) throws Ser @Override public void rollback() { for (final MultipartFormFile formFile : elementsFile.values()) { - formFile.destroy(); + try { + formFile.destroy(); + } catch (final Exception e) { + logger.warn("Failed to destroy {}", formFile, e); + } } } // =================================================================================== // Add Text // ======== - protected void addTextParameter(final HttpServletRequest request, final FileItem item) { + protected void addTextParameter(final HttpServletRequest request, final DiskFileItem item) { final String name = item.getFieldName(); - final String encoding = request.getCharacterEncoding(); + final Charset encoding = getRequestCharset(request); String value = null; boolean haveValue = false; if (encoding != null) { @@ -253,8 +274,8 @@ protected void addTextParameter(final HttpServletRequest request, final FileItem } if (!haveValue) { try { - value = item.getString("ISO-8859-1"); - } catch (final java.io.UnsupportedEncodingException uee) { + value = item.getString(StandardCharsets.ISO_8859_1); + } catch (final Exception uee) { value = item.getString(); } haveValue = true; @@ -275,13 +296,13 @@ protected void addTextParameter(final HttpServletRequest request, final FileItem elementsAll.put(name, newArray); } - protected void addFileParameter(final FileItem item) { + protected void addFileParameter(final DiskFileItem item) { final MultipartFormFile formFile = newActionMultipartFormFile(item); elementsFile.put(item.getFieldName(), formFile); elementsAll.put(item.getFieldName(), formFile); } - protected ActionMultipartFormFile newActionMultipartFormFile(final FileItem item) { + protected ActionMultipartFormFile newActionMultipartFormFile(final DiskFileItem item) { return new ActionMultipartFormFile(item); } @@ -296,11 +317,11 @@ public void finish() { // =================================================================================== // Small Helper // ============ - protected long getSizeMax() { + protected Integer getSizeMax() { return ComponentUtil.getFessConfig().getHttpFileuploadMaxSizeAsInteger(); } - protected long getSizeThreshold() { + protected Integer getSizeThreshold() { return ComponentUtil.getFessConfig().getHttpFileuploadThresholdSizeAsInteger(); } @@ -320,9 +341,9 @@ protected static class ActionMultipartFormFile implements MultipartFormFile, Ser private static final long serialVersionUID = 1L; - protected final FileItem fileItem; + protected final DiskFileItem fileItem; - public ActionMultipartFormFile(final FileItem fileItem) { + public ActionMultipartFormFile(final DiskFileItem fileItem) { this.fileItem = fileItem; } @@ -366,7 +387,11 @@ protected String getBaseFileName(final String filePath) { @Override public void destroy() { - fileItem.delete(); + try { + fileItem.delete(); + } catch (IOException e) { + throw new IORuntimeException(e); + } } @Override diff --git a/src/main/java/org/codelibs/fess/query/QueryFieldConfig.java b/src/main/java/org/codelibs/fess/query/QueryFieldConfig.java index 1fa090fcbd..2a9f6a6a7b 100644 --- a/src/main/java/org/codelibs/fess/query/QueryFieldConfig.java +++ b/src/main/java/org/codelibs/fess/query/QueryFieldConfig.java @@ -26,8 +26,6 @@ import java.util.function.Consumer; import java.util.stream.Stream; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -35,6 +33,8 @@ import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.util.ComponentUtil; +import jakarta.annotation.PostConstruct; + public class QueryFieldConfig { private static final Logger logger = LogManager.getLogger(QueryFieldConfig.class); diff --git a/src/main/java/org/codelibs/fess/query/QueryProcessor.java b/src/main/java/org/codelibs/fess/query/QueryProcessor.java index c015e3dbaf..b3cb533363 100644 --- a/src/main/java/org/codelibs/fess/query/QueryProcessor.java +++ b/src/main/java/org/codelibs/fess/query/QueryProcessor.java @@ -20,8 +20,6 @@ import java.util.List; import java.util.Map; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.search.Query; @@ -30,6 +28,8 @@ import org.lastaflute.core.message.UserMessages; import org.opensearch.index.query.QueryBuilder; +import jakarta.annotation.PostConstruct; + public class QueryProcessor { private static final Logger logger = LogManager.getLogger(QueryProcessor.class); diff --git a/src/main/java/org/codelibs/fess/query/parser/QueryParser.java b/src/main/java/org/codelibs/fess/query/parser/QueryParser.java index 2495180402..73e293263a 100644 --- a/src/main/java/org/codelibs/fess/query/parser/QueryParser.java +++ b/src/main/java/org/codelibs/fess/query/parser/QueryParser.java @@ -18,8 +18,6 @@ import java.util.ArrayList; import java.util.List; -import javax.annotation.PostConstruct; - import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.core.WhitespaceAnalyzer; import org.apache.lucene.queryparser.classic.ParseException; @@ -32,6 +30,8 @@ import org.codelibs.fess.Constants; import org.codelibs.fess.exception.QueryParseException; +import jakarta.annotation.PostConstruct; + public class QueryParser { protected String defaultField = Constants.DEFAULT_FIELD; diff --git a/src/main/java/org/codelibs/fess/rank/fusion/RankFusionProcessor.java b/src/main/java/org/codelibs/fess/rank/fusion/RankFusionProcessor.java index 6dcdcad9d9..ccc13336ad 100644 --- a/src/main/java/org/codelibs/fess/rank/fusion/RankFusionProcessor.java +++ b/src/main/java/org/codelibs/fess/rank/fusion/RankFusionProcessor.java @@ -29,11 +29,6 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.search.TotalHits.Relation; @@ -55,6 +50,11 @@ import org.lastaflute.web.util.LaRequestUtil; import org.lastaflute.web.util.LaResponseUtil; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + public class RankFusionProcessor implements AutoCloseable { private static final Logger logger = LogManager.getLogger(RankFusionProcessor.class); 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 cb657be7f0..536cc4a15a 100644 --- a/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java +++ b/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java @@ -34,10 +34,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -79,6 +75,10 @@ import com.nimbusds.openid.connect.sdk.AuthenticationResponseParser; import com.nimbusds.openid.connect.sdk.AuthenticationSuccessResponse; +import jakarta.annotation.PostConstruct; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; + public class AzureAdAuthenticator implements SsoAuthenticator { private static final Logger logger = LogManager.getLogger(AzureAdAuthenticator.class); diff --git a/src/main/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java b/src/main/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java index 8e7234fc3d..d651aee1de 100644 --- a/src/main/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java +++ b/src/main/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java @@ -22,10 +22,6 @@ import java.util.List; import java.util.Map; -import javax.annotation.PostConstruct; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -56,6 +52,10 @@ import com.google.api.client.json.jackson2.JacksonFactory; import com.google.api.client.util.Base64; +import jakarta.annotation.PostConstruct; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; + public class OpenIdConnectAuthenticator implements SsoAuthenticator { private static final Logger logger = LogManager.getLogger(OpenIdConnectAuthenticator.class); 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 fa8cefc57a..2af4eb6dde 100644 --- a/src/main/java/org/codelibs/fess/sso/saml/SamlAuthenticator.java +++ b/src/main/java/org/codelibs/fess/sso/saml/SamlAuthenticator.java @@ -22,11 +22,6 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -44,6 +39,11 @@ import org.codelibs.fess.sso.SsoAuthenticator; import org.codelibs.fess.sso.SsoResponseType; import org.codelibs.fess.util.ComponentUtil; +import org.codelibs.saml2.Auth; +import org.codelibs.saml2.core.authn.AuthnRequestParams; +import org.codelibs.saml2.core.logout.LogoutRequestParams; +import org.codelibs.saml2.core.settings.Saml2Settings; +import org.codelibs.saml2.core.settings.SettingsBuilder; import org.dbflute.optional.OptionalEntity; import org.lastaflute.core.message.UserMessages; import org.lastaflute.web.login.credential.LoginCredential; @@ -53,11 +53,10 @@ import org.lastaflute.web.util.LaRequestUtil; import org.lastaflute.web.util.LaResponseUtil; -import com.onelogin.saml2.Auth; -import com.onelogin.saml2.authn.AuthnRequestParams; -import com.onelogin.saml2.logout.LogoutRequestParams; -import com.onelogin.saml2.settings.Saml2Settings; -import com.onelogin.saml2.settings.SettingsBuilder; +import jakarta.annotation.PostConstruct; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; public class SamlAuthenticator implements SsoAuthenticator { 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 842c144534..6f1f13f086 100644 --- a/src/main/java/org/codelibs/fess/sso/spnego/SpnegoAuthenticator.java +++ b/src/main/java/org/codelibs/fess/sso/spnego/SpnegoAuthenticator.java @@ -19,11 +19,6 @@ import java.util.Arrays; import java.util.Enumeration; -import javax.annotation.PostConstruct; -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletResponse; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.io.ResourceUtil; @@ -49,6 +44,11 @@ import org.lastaflute.web.util.LaRequestUtil; import org.lastaflute.web.util.LaResponseUtil; +import jakarta.annotation.PostConstruct; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletResponse; + public class SpnegoAuthenticator implements SsoAuthenticator { private static final Logger logger = LogManager.getLogger(SpnegoAuthenticator.class); diff --git a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java index 8347247229..0665992052 100644 --- a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java +++ b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java @@ -43,8 +43,6 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; - import org.apache.commons.lang3.time.DurationFormatUtils; import org.apache.commons.text.StringEscapeUtils; import org.apache.logging.log4j.LogManager; @@ -67,6 +65,8 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import jakarta.servlet.http.HttpServletRequest; + public class FessFunctions { private static final Logger logger = LogManager.getLogger(FessFunctions.class); diff --git a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java index f98ba8f166..c2317f7739 100644 --- a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java +++ b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java @@ -33,9 +33,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Stream; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; @@ -56,6 +53,9 @@ import com.google.common.collect.Lists; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; + public class ThumbnailManager { private static final String NOIMAGE_FILE_SUFFIX = ".txt"; diff --git a/src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java b/src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java index a0bf63af26..355384dcd4 100644 --- a/src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java +++ b/src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java @@ -24,8 +24,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.concurrent.CommonPoolUtil; @@ -36,6 +34,8 @@ import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.util.InputStreamThread; +import jakarta.annotation.PostConstruct; + public class CommandGenerator extends BaseThumbnailGenerator { private static final Logger logger = LogManager.getLogger(CommandGenerator.class); diff --git a/src/main/java/org/codelibs/fess/util/DocumentUtil.java b/src/main/java/org/codelibs/fess/util/DocumentUtil.java index c2af2d7823..30994b3931 100644 --- a/src/main/java/org/codelibs/fess/util/DocumentUtil.java +++ b/src/main/java/org/codelibs/fess/util/DocumentUtil.java @@ -23,13 +23,13 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; - import org.codelibs.fess.Constants; import org.codelibs.fess.crawler.util.CharUtil; import org.codelibs.fess.taglib.FessFunctions; import org.lastaflute.web.util.LaRequestUtil; +import jakarta.servlet.http.HttpServletRequest; + public final class DocumentUtil { private DocumentUtil() { diff --git a/src/main/java/org/codelibs/fess/util/ResourceUtil.java b/src/main/java/org/codelibs/fess/util/ResourceUtil.java index 29eeab2e69..fd0b7d1de7 100644 --- a/src/main/java/org/codelibs/fess/util/ResourceUtil.java +++ b/src/main/java/org/codelibs/fess/util/ResourceUtil.java @@ -23,14 +23,14 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.ServletContext; - import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.mylasta.direction.FessConfig; import org.dbflute.optional.OptionalEntity; import org.lastaflute.web.util.LaServletContextUtil; +import jakarta.servlet.ServletContext; + public class ResourceUtil { private static final String FESS_OVERRIDE_CONF_PATH = "FESS_OVERRIDE_CONF_PATH"; diff --git a/src/main/java/org/codelibs/fess/validation/CronExpression.java b/src/main/java/org/codelibs/fess/validation/CronExpression.java index 6b3204f57f..69e9f7120c 100644 --- a/src/main/java/org/codelibs/fess/validation/CronExpression.java +++ b/src/main/java/org/codelibs/fess/validation/CronExpression.java @@ -26,8 +26,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) diff --git a/src/main/java/org/codelibs/fess/validation/CronExpressionValidator.java b/src/main/java/org/codelibs/fess/validation/CronExpressionValidator.java index 5e93819514..ea859be0ce 100644 --- a/src/main/java/org/codelibs/fess/validation/CronExpressionValidator.java +++ b/src/main/java/org/codelibs/fess/validation/CronExpressionValidator.java @@ -15,12 +15,12 @@ */ package org.codelibs.fess.validation; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - import org.codelibs.core.lang.StringUtil; import org.lastaflute.job.util.LaCronUtil; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; + public class CronExpressionValidator implements ConstraintValidator { @Override diff --git a/src/main/java/org/codelibs/fess/validation/CustomSize.java b/src/main/java/org/codelibs/fess/validation/CustomSize.java index f175f449cd..5b2e5a67e1 100644 --- a/src/main/java/org/codelibs/fess/validation/CustomSize.java +++ b/src/main/java/org/codelibs/fess/validation/CustomSize.java @@ -26,18 +26,18 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; - import org.codelibs.core.lang.StringUtil; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @Constraint(validatedBy = CustomSizeValidator.class) public @interface CustomSize { - String message() default "{javax.validation.constraints.Size.message}"; + String message() default "{jakarta.validation.constraints.Size.message}"; Class[] groups() default {}; diff --git a/src/main/java/org/codelibs/fess/validation/CustomSizeValidator.java b/src/main/java/org/codelibs/fess/validation/CustomSizeValidator.java index 7912d9d964..85e6f7bc36 100644 --- a/src/main/java/org/codelibs/fess/validation/CustomSizeValidator.java +++ b/src/main/java/org/codelibs/fess/validation/CustomSizeValidator.java @@ -15,14 +15,14 @@ */ package org.codelibs.fess.validation; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.util.ComponentUtil; import org.hibernate.validator.constraintvalidation.HibernateConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; + public class CustomSizeValidator implements ConstraintValidator { private int min = 0; private int max = Integer.MAX_VALUE; diff --git a/src/main/java/org/codelibs/fess/validation/UriType.java b/src/main/java/org/codelibs/fess/validation/UriType.java index e8cfe5be9b..9f99fd363a 100644 --- a/src/main/java/org/codelibs/fess/validation/UriType.java +++ b/src/main/java/org/codelibs/fess/validation/UriType.java @@ -26,11 +26,11 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; - import org.codelibs.fess.validation.UriTypeValidator.ProtocolType; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented diff --git a/src/main/java/org/codelibs/fess/validation/UriTypeValidator.java b/src/main/java/org/codelibs/fess/validation/UriTypeValidator.java index a15f3da43d..91f80aa323 100644 --- a/src/main/java/org/codelibs/fess/validation/UriTypeValidator.java +++ b/src/main/java/org/codelibs/fess/validation/UriTypeValidator.java @@ -15,13 +15,13 @@ */ package org.codelibs.fess.validation; -import javax.validation.ConstraintDefinitionException; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.util.ComponentUtil; +import jakarta.validation.ConstraintDefinitionException; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; + public class UriTypeValidator implements ConstraintValidator { private String[] protocols; diff --git a/src/main/webapp/WEB-INF/fe.tld b/src/main/webapp/WEB-INF/fe.tld index f09a5d07e9..08741d550f 100644 --- a/src/main/webapp/WEB-INF/fe.tld +++ b/src/main/webapp/WEB-INF/fe.tld @@ -9,7 +9,7 @@ JSTL functions 1.1 fe - http://fess.codelibs.org/functions + fess.tags.functions diff --git a/src/main/webapp/WEB-INF/orig/view/error/redirect.jsp b/src/main/webapp/WEB-INF/orig/view/error/redirect.jsp index 7ac476e808..4f4bcff9ab 100644 --- a/src/main/webapp/WEB-INF/orig/view/error/redirect.jsp +++ b/src/main/webapp/WEB-INF/orig/view/error/redirect.jsp @@ -1,10 +1,10 @@ <% -Integer statusCode = (Integer)request.getAttribute("javax.servlet.error.status_code"); -String servletName = (String)request.getAttribute("javax.servlet.error.servlet_name"); -String requestUri = (String)request.getAttribute("javax.servlet.error.request_uri"); +Integer statusCode = (Integer)request.getAttribute("jakarta.servlet.error.status_code"); +String servletName = (String)request.getAttribute("jakarta.servlet.error.servlet_name"); +String requestUri = (String)request.getAttribute("jakarta.servlet.error.request_uri"); String type = request.getParameter("type"); StringBuilder redirectPage = new StringBuilder(); -redirectPage.append(((javax.servlet.http.HttpServletRequest)request).getContextPath()); +redirectPage.append(((jakarta.servlet.http.HttpServletRequest)request).getContextPath()); if("systemError".equals(type)) { if(requestUri != null && !requestUri.endsWith("systemError")) { redirectPage.append("/error/systemerror/"); diff --git a/src/main/webapp/WEB-INF/view/common/common.jsp b/src/main/webapp/WEB-INF/view/common/common.jsp index 70224217f4..c4ff2f6d86 100644 --- a/src/main/webapp/WEB-INF/view/common/common.jsp +++ b/src/main/webapp/WEB-INF/view/common/common.jsp @@ -1,7 +1,7 @@ -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%><%-- - --%><%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%><%-- - --%><%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %><%-- +<%@taglib prefix="c" uri="jakarta.tags.core"%><%-- + --%><%@taglib prefix="fmt" uri="jakarta.tags.fmt"%><%-- + --%><%@taglib prefix="fn" uri="jakarta.tags.functions" %><%-- --%><%@taglib prefix="la" uri="http://lastaflute.org/latags" %><%-- --%><%@taglib prefix="f" uri="http://lastaflute.org/functions" %><%-- - --%><%@taglib prefix="fe" uri="http://fess.codelibs.org/functions" %><%-- - --%> \ No newline at end of file + --%><%@taglib prefix="fe" uri="fess.tags.functions" %><%-- + --%> diff --git a/src/main/webapp/WEB-INF/view/error/redirect.jsp b/src/main/webapp/WEB-INF/view/error/redirect.jsp index 7ac476e808..4f4bcff9ab 100644 --- a/src/main/webapp/WEB-INF/view/error/redirect.jsp +++ b/src/main/webapp/WEB-INF/view/error/redirect.jsp @@ -1,10 +1,10 @@ <% -Integer statusCode = (Integer)request.getAttribute("javax.servlet.error.status_code"); -String servletName = (String)request.getAttribute("javax.servlet.error.servlet_name"); -String requestUri = (String)request.getAttribute("javax.servlet.error.request_uri"); +Integer statusCode = (Integer)request.getAttribute("jakarta.servlet.error.status_code"); +String servletName = (String)request.getAttribute("jakarta.servlet.error.servlet_name"); +String requestUri = (String)request.getAttribute("jakarta.servlet.error.request_uri"); String type = request.getParameter("type"); StringBuilder redirectPage = new StringBuilder(); -redirectPage.append(((javax.servlet.http.HttpServletRequest)request).getContextPath()); +redirectPage.append(((jakarta.servlet.http.HttpServletRequest)request).getContextPath()); if("systemError".equals(type)) { if(requestUri != null && !requestUri.endsWith("systemError")) { redirectPage.append("/error/systemerror/"); diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 6cc6367388..d4478b3905 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -14,10 +14,11 @@ * either express or implied. See the License for the specific language * governing permissions and limitations under the License. --> - + @@ -118,7 +119,7 @@ - org.apache.commons.fileupload.servlet.FileCleanerCleanup + org.apache.commons.fileupload2.jakarta.JakartaFileCleaner diff --git a/src/test/java/org/codelibs/fess/helper/RoleQueryHelperTest.java b/src/test/java/org/codelibs/fess/helper/RoleQueryHelperTest.java index 4ccc8da17f..92fcd5386d 100644 --- a/src/test/java/org/codelibs/fess/helper/RoleQueryHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/RoleQueryHelperTest.java @@ -18,12 +18,12 @@ import java.util.HashSet; import java.util.Set; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; - import org.codelibs.core.crypto.CachedCipher; import org.codelibs.fess.unit.UnitFessTestCase; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; + public class RoleQueryHelperTest extends UnitFessTestCase { public CachedCipher cipher; From bedf2934b15b9fedddd0095dce40ee9a9585542e Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Sat, 23 Dec 2023 19:30:36 +0900 Subject: [PATCH 02/69] fix #2789 bump up to java 21 --- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/maven.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c1571920c9..cbf0c35e1a 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -70,10 +70,10 @@ jobs: # make bootstrap # make release - uses: actions/checkout@v2 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v2 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: Cache Maven packages uses: actions/cache@v2 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 362fc8c7a4..e5dc3f778e 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -20,10 +20,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v2 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - uses: actions/cache@v1 with: From c1f8467d66eee8066d8beb01581d4780999cd68f Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Sun, 24 Dec 2023 14:31:18 +0900 Subject: [PATCH 03/69] fix #2790 Enhanced exception logging to warning level in action classes --- .../admin/accesstoken/AdminAccesstokenAction.java | 7 +++++++ .../app/web/admin/badword/AdminBadwordAction.java | 8 ++++++++ .../app/web/admin/boostdoc/AdminBoostdocAction.java | 7 +++++++ .../web/admin/dataconfig/AdminDataconfigAction.java | 7 +++++++ .../fess/app/web/admin/design/AdminDesignAction.java | 3 ++- .../admin/dict/kuromoji/AdminDictKuromojiAction.java | 8 ++++++++ .../admin/dict/mapping/AdminDictMappingAction.java | 8 ++++++++ .../dict/protwords/AdminDictProtwordsAction.java | 5 +++++ .../AdminDictStemmeroverrideAction.java | 8 ++++++++ .../dict/stopwords/AdminDictStopwordsAction.java | 5 +++++ .../admin/dict/synonym/AdminDictSynonymAction.java | 8 ++++++++ .../duplicatehost/AdminDuplicatehostAction.java | 7 +++++++ .../admin/elevateword/AdminElevatewordAction.java | 8 ++++++++ .../app/web/admin/fileauth/AdminFileauthAction.java | 7 +++++++ .../web/admin/fileconfig/AdminFileconfigAction.java | 7 +++++++ .../fess/app/web/admin/group/AdminGroupAction.java | 6 +++--- .../app/web/admin/keymatch/AdminKeymatchAction.java | 7 +++++++ .../web/admin/labeltype/AdminLabeltypeAction.java | 7 +++++++ .../app/web/admin/pathmap/AdminPathmapAction.java | 7 +++++++ .../relatedcontent/AdminRelatedcontentAction.java | 7 +++++++ .../admin/relatedquery/AdminRelatedqueryAction.java | 7 +++++++ .../web/admin/reqheader/AdminReqheaderAction.java | 7 +++++++ .../fess/app/web/admin/role/AdminRoleAction.java | 4 ++-- .../web/admin/scheduler/AdminSchedulerAction.java | 9 +++++++++ .../web/admin/searchlist/AdminSearchlistAction.java | 11 ++++++----- .../app/web/admin/storage/AdminStorageAction.java | 12 ++++-------- .../fess/app/web/admin/user/AdminUserAction.java | 6 +++--- .../app/web/admin/webauth/AdminWebauthAction.java | 7 +++++++ .../web/admin/webconfig/AdminWebconfigAction.java | 7 +++++++ .../fess/app/web/admin/wizard/AdminWizardAction.java | 2 +- .../admin/accesstoken/ApiAdminAccesstokenAction.java | 7 +++++++ .../web/api/admin/badword/ApiAdminBadwordAction.java | 9 +++++++++ .../api/admin/boostdoc/ApiAdminBoostdocAction.java | 7 +++++++ .../crawlinginfo/ApiAdminCrawlinginfoAction.java | 6 ++++++ .../admin/dataconfig/ApiAdminDataconfigAction.java | 7 +++++++ .../dict/kuromoji/ApiAdminDictKuromojiAction.java | 5 +++++ .../dict/mapping/ApiAdminDictMappingAction.java | 5 +++++ .../dict/protwords/ApiAdminDictProtwordsAction.java | 6 ++++++ .../ApiAdminDictStemmeroverrideAction.java | 5 +++++ .../dict/stopwords/ApiAdminDictStopwordsAction.java | 6 ++++++ .../dict/synonym/ApiAdminDictSynonymAction.java | 5 +++++ .../duplicatehost/ApiAdminDuplicatehostAction.java | 7 +++++++ .../admin/elevateword/ApiAdminElevatewordAction.java | 9 +++++++++ .../admin/failureurl/ApiAdminFailureurlAction.java | 6 ++++++ .../api/admin/fileauth/ApiAdminFileauthAction.java | 7 +++++++ .../admin/fileconfig/ApiAdminFileconfigAction.java | 7 +++++++ .../app/web/api/admin/group/ApiAdminGroupAction.java | 6 ++++++ .../web/api/admin/joblog/ApiAdminJoblogAction.java | 5 +++++ .../api/admin/keymatch/ApiAdminKeymatchAction.java | 7 +++++++ .../api/admin/labeltype/ApiAdminLabeltypeAction.java | 7 +++++++ .../web/api/admin/pathmap/ApiAdminPathmapAction.java | 7 +++++++ .../relatedcontent/ApiAdminRelatedcontentAction.java | 7 +++++++ .../relatedquery/ApiAdminRelatedqueryAction.java | 7 +++++++ .../api/admin/reqheader/ApiAdminReqheaderAction.java | 7 +++++++ .../app/web/api/admin/role/ApiAdminRoleAction.java | 7 +++++++ .../api/admin/scheduler/ApiAdminSchedulerAction.java | 8 ++++++++ .../admin/searchlist/ApiAdminSearchlistAction.java | 9 +++++---- .../web/api/admin/storage/ApiAdminStorageAction.java | 12 +++--------- .../app/web/api/admin/user/ApiAdminUserAction.java | 7 +++++++ .../web/api/admin/webauth/ApiAdminWebauthAction.java | 7 +++++++ .../api/admin/webconfig/ApiAdminWebconfigAction.java | 7 +++++++ .../org/codelibs/fess/app/web/login/LoginAction.java | 3 +++ .../codelibs/fess/app/web/profile/ProfileAction.java | 2 +- 63 files changed, 391 insertions(+), 37 deletions(-) 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 ab3a1749ff..683f927407 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 @@ -20,6 +20,8 @@ import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -47,6 +49,8 @@ */ public class AdminAccesstokenAction extends FessAdminAction { + private static final Logger logger = LogManager.getLogger(AdminAccesstokenAction.class); + public static final String ROLE = "admin-accesstoken"; public static final String TOKEN = "token"; @@ -205,6 +209,7 @@ public HtmlResponse create(final CreateForm form) { accessTokenService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -225,6 +230,7 @@ public HtmlResponse update(final EditForm form) { accessTokenService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -246,6 +252,7 @@ public HtmlResponse delete(final EditForm form) { accessTokenService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } 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 3983e5f3e3..cacf40b0ee 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 @@ -25,6 +25,8 @@ import java.nio.file.Files; import java.nio.file.Path; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.concurrent.CommonPoolUtil; import org.codelibs.fess.Constants; @@ -56,6 +58,8 @@ public class AdminBadwordAction extends FessAdminAction { public static final String ROLE = "admin-badword"; + private static final Logger logger = LogManager.getLogger(AdminBadwordAction.class); + // =================================================================================== // Attribute // ========= @@ -208,6 +212,7 @@ public ActionResponse download(final DownloadForm form) { try (Writer writer = new BufferedWriter(new OutputStreamWriter(Files.newOutputStream(tempFile), getCsvEncoding()))) { badWordService.exportCsv(writer); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsFailedToDownloadBadwordFile(GLOBAL), this::asDownloadHtml); } try (InputStream in = Files.newInputStream(tempFile)) { @@ -244,6 +249,7 @@ public HtmlResponse create(final CreateForm form) { suggestHelper.addBadWord(entity.getSuggestWord(), false); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -265,6 +271,7 @@ public HtmlResponse update(final EditForm form) { suggestHelper.storeAllBadWords(false); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -287,6 +294,7 @@ public HtmlResponse delete(final EditForm form) { suggestHelper.deleteBadWord(entity.getSuggestWord()); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asDetailsHtml); } 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 d561897044..774917aa08 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.app.web.admin.boostdoc; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; @@ -42,6 +44,8 @@ public class AdminBoostdocAction extends FessAdminAction { public static final String ROLE = "admin-boostdoc"; + private static final Logger logger = LogManager.getLogger(AdminBoostdocAction.class); + // =================================================================================== // Attribute // ========= @@ -185,6 +189,7 @@ public HtmlResponse create(final CreateForm form) { boostDocumentRuleService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -205,6 +210,7 @@ public HtmlResponse update(final EditForm form) { boostDocumentRuleService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -226,6 +232,7 @@ public HtmlResponse delete(final EditForm form) { boostDocumentRuleService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } 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 91b275713c..035931ac86 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 @@ -25,6 +25,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; @@ -57,6 +59,8 @@ public class AdminDataconfigAction extends FessAdminAction { public static final String ROLE = "admin-dataconfig"; + private static final Logger logger = LogManager.getLogger(AdminDataconfigAction.class); + // =================================================================================== // Attribute // ========= @@ -231,6 +235,7 @@ public HtmlResponse create(final CreateForm form) { dataConfigService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -251,6 +256,7 @@ public HtmlResponse update(final EditForm form) { dataConfigService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -272,6 +278,7 @@ public HtmlResponse delete(final EditForm form) { dataConfigService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java b/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java index 016581b453..ef13faff79 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java @@ -135,6 +135,7 @@ public HtmlResponse upload(final UploadForm form) { fileName = fileName.substring(pos + 1); } } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsDesignFileNameIsInvalid("designFile"), this::asListHtml); } } @@ -274,7 +275,7 @@ public HtmlResponse update(final EditForm form) { write(jspFile.getAbsolutePath(), form.content.getBytes(Constants.UTF_8)); saveInfo(messages -> messages.addSuccessUpdateDesignJspFile(GLOBAL, jspFile.getAbsolutePath())); } catch (final Exception e) { - logger.error("Failed to update {}", form.fileName, e); + logger.warn("Failed to update {}", form.fileName, e); throwValidationError(messages -> messages.addErrorsFailedToUpdateJspFile(GLOBAL), this::asListHtml); } return redirect(getClass()); 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 e5494fef91..dc6e385660 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 @@ -19,6 +19,8 @@ import java.io.IOException; import java.io.InputStream; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -52,6 +54,8 @@ public class AdminDictKuromojiAction extends FessAdminAction { public static final String ROLE = "admin-dict"; + private static final Logger logger = LogManager.getLogger(AdminDictKuromojiAction.class); + // =================================================================================== // Attribute // ========= @@ -258,6 +262,7 @@ public HtmlResponse upload(final UploadForm form) { try (InputStream inputStream = form.kuromojiFile.getInputStream()) { file.update(inputStream); } catch (final IOException e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsFailedToUploadKuromojiFile(GLOBAL), () -> redirectWith(getClass(), moreUrl("uploadpage/" + form.dictId))); } @@ -285,6 +290,7 @@ public HtmlResponse create(final CreateForm form) { kuromojiService.store(form.dictId, entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -306,6 +312,7 @@ public HtmlResponse update(final EditForm form) { kuromojiService.store(form.dictId, entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -326,6 +333,7 @@ public HtmlResponse delete(final EditForm form) { kuromojiService.delete(form.dictId, entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } 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 531e5a0f01..5de0e57281 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 @@ -21,6 +21,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -54,6 +56,8 @@ public class AdminDictMappingAction extends FessAdminAction { public static final String ROLE = "admin-dict"; + private static final Logger logger = LogManager.getLogger(AdminDictMappingAction.class); + // =================================================================================== // Attribute // ========= @@ -261,6 +265,7 @@ public HtmlResponse upload(final UploadForm form) { try (InputStream inputStream = form.charMappingFile.getInputStream()) { file.update(inputStream); } catch (final IOException e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsFailedToUploadMappingFile(GLOBAL), () -> redirectWith(getClass(), moreUrl("uploadpage/" + form.dictId))); } @@ -287,6 +292,7 @@ public HtmlResponse create(final CreateForm form) { charMappingService.store(form.dictId, entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -307,6 +313,7 @@ public HtmlResponse update(final EditForm form) { charMappingService.store(form.dictId, entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -327,6 +334,7 @@ public HtmlResponse delete(final EditForm form) { charMappingService.delete(form.dictId, entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } 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 d24928f0d3..266d49681f 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 @@ -19,6 +19,8 @@ import java.io.IOException; import java.io.InputStream; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -51,6 +53,8 @@ public class AdminDictProtwordsAction extends FessAdminAction { public static final String ROLE = "admin-dict"; + private static final Logger logger = LogManager.getLogger(AdminDictProtwordsAction.class); + // =================================================================================== // Attribute // ========= @@ -256,6 +260,7 @@ public HtmlResponse upload(final UploadForm form) { try (InputStream inputStream = form.protwordsFile.getInputStream()) { file.update(inputStream); } catch (final IOException e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsFailedToUploadProtwordsFile(GLOBAL), () -> redirectWith(getClass(), moreUrl("uploadpage/" + 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 67e610bbb1..196f7ba667 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 @@ -19,6 +19,8 @@ import java.io.IOException; import java.io.InputStream; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -51,6 +53,8 @@ public class AdminDictStemmeroverrideAction extends FessAdminAction { public static final String ROLE = "admin-dict"; + private static final Logger logger = LogManager.getLogger(AdminDictStemmeroverrideAction.class); + // =================================================================================== // Attribute // ========= @@ -259,6 +263,7 @@ public HtmlResponse upload(final UploadForm form) { try (InputStream inputStream = form.stemmerOverrideFile.getInputStream()) { file.update(inputStream); } catch (final IOException e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsFailedToUploadStemmeroverrideFile(GLOBAL), () -> redirectWith(getClass(), moreUrl("uploadpage/" + form.dictId))); } @@ -285,6 +290,7 @@ public HtmlResponse create(final CreateForm form) { stemmerOverrideService.store(form.dictId, entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -305,6 +311,7 @@ public HtmlResponse update(final EditForm form) { stemmerOverrideService.store(form.dictId, entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -326,6 +333,7 @@ public HtmlResponse delete(final EditForm form) { stemmerOverrideService.delete(form.dictId, entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } 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 b7a4cbf850..956fc3d784 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 @@ -19,6 +19,8 @@ import java.io.IOException; import java.io.InputStream; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -49,6 +51,8 @@ public class AdminDictStopwordsAction extends FessAdminAction { public static final String ROLE = "admin-dict"; + private static final Logger logger = LogManager.getLogger(AdminDictStopwordsAction.class); + // =================================================================================== // Attribute // ========= @@ -254,6 +258,7 @@ public HtmlResponse upload(final UploadForm form) { try (InputStream inputStream = form.stopwordsFile.getInputStream()) { file.update(inputStream); } catch (final IOException e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsFailedToUploadStopwordsFile(GLOBAL), () -> redirectWith(getClass(), moreUrl("uploadpage/" + 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 e1fcfe389e..e388774296 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 @@ -21,6 +21,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -54,6 +56,8 @@ public class AdminDictSynonymAction extends FessAdminAction { public static final String ROLE = "admin-dict"; + private static final Logger logger = LogManager.getLogger(AdminDictSynonymAction.class); + // =================================================================================== // Attribute // ========= @@ -261,6 +265,7 @@ public HtmlResponse upload(final UploadForm form) { try (InputStream inputStream = form.synonymFile.getInputStream()) { file.update(inputStream); } catch (final IOException e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsFailedToUploadSynonymFile(GLOBAL), () -> redirectWith(getClass(), moreUrl("uploadpage/" + form.dictId))); } @@ -287,6 +292,7 @@ public HtmlResponse create(final CreateForm form) { synonymService.store(form.dictId, entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -307,6 +313,7 @@ public HtmlResponse update(final EditForm form) { synonymService.store(form.dictId, entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -328,6 +335,7 @@ public HtmlResponse delete(final EditForm form) { synonymService.delete(form.dictId, entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } 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 196014c225..528654694f 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.app.web.admin.duplicatehost; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.DuplicateHostPager; @@ -42,6 +44,8 @@ public class AdminDuplicatehostAction extends FessAdminAction { public static final String ROLE = "admin-duplicatehost"; + private static final Logger logger = LogManager.getLogger(AdminDuplicatehostAction.class); + // =================================================================================== // Attribute // ========= @@ -185,6 +189,7 @@ public HtmlResponse create(final CreateForm form) { duplicateHostService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -205,6 +210,7 @@ public HtmlResponse update(final EditForm form) { duplicateHostService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -226,6 +232,7 @@ public HtmlResponse delete(final EditForm form) { duplicateHostService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } 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 82f9a2b76a..0b4ad37cb8 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 @@ -30,6 +30,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.concurrent.CommonPoolUtil; import org.codelibs.core.lang.StringUtil; @@ -64,6 +66,8 @@ public class AdminElevatewordAction extends FessAdminAction { public static final String ROLE = "admin-elevateword"; + private static final Logger logger = LogManager.getLogger(AdminElevatewordAction.class); + // =================================================================================== // Attribute // ========= @@ -226,6 +230,7 @@ public ActionResponse download(final DownloadForm form) { try (Writer writer = new BufferedWriter(new OutputStreamWriter(Files.newOutputStream(tempFile), getCsvEncoding()))) { elevateWordService.exportCsv(writer); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsFailedToDownloadElevateFile(GLOBAL), this::asDownloadHtml); } try (InputStream in = Files.newInputStream(tempFile)) { @@ -263,6 +268,7 @@ public HtmlResponse create(final CreateForm form) { entity.getPermissions(), entity.getBoost(), false); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -285,6 +291,7 @@ public HtmlResponse update(final EditForm form) { suggestHelper.storeAllElevateWords(false); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -307,6 +314,7 @@ public HtmlResponse delete(final EditForm form) { suggestHelper.deleteElevateWord(entity.getSuggestWord(), false); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } 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 49cc74d8c1..0016a5f880 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 @@ -21,6 +21,8 @@ import java.util.Locale; import java.util.Map; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.FileAuthPager; @@ -50,6 +52,8 @@ public class AdminFileauthAction extends FessAdminAction { public static final String ROLE = "admin-fileauth"; + private static final Logger logger = LogManager.getLogger(AdminFileauthAction.class); + // =================================================================================== // Attribute // ========= @@ -200,6 +204,7 @@ public HtmlResponse create(final CreateForm form) { fileAuthenticationService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -220,6 +225,7 @@ public HtmlResponse update(final EditForm form) { fileAuthenticationService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -241,6 +247,7 @@ public HtmlResponse delete(final EditForm form) { fileAuthenticationService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } 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 7e1a928f75..58431da1cb 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 @@ -21,6 +21,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; @@ -53,6 +55,8 @@ public class AdminFileconfigAction extends FessAdminAction { public static final String ROLE = "admin-fileconfig"; + private static final Logger logger = LogManager.getLogger(AdminFileconfigAction.class); + // =================================================================================== // Attribute // ========= @@ -223,6 +227,7 @@ public HtmlResponse create(final CreateForm form) { fileConfigService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -243,6 +248,7 @@ public HtmlResponse update(final EditForm form) { fileConfigService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -264,6 +270,7 @@ public HtmlResponse delete(final EditForm form) { fileConfigService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } 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 26a0f62c89..d70760c523 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 @@ -195,7 +195,7 @@ public HtmlResponse create(final CreateForm form) { groupService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { - logger.error("Failed to add {}", entity, e); + logger.warn("Failed to add {}", entity, e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -217,7 +217,7 @@ public HtmlResponse update(final EditForm form) { groupService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { - logger.error("Failed to update {}", entity, e); + logger.warn("Failed to update {}", entity, e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -239,7 +239,7 @@ public HtmlResponse delete(final EditForm form) { groupService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { - logger.error("Failed to delete {}", entity, e); + logger.warn("Failed to delete {}", entity, e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asDetailsHtml); } 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 07f5877874..c4ab19169f 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 @@ -19,6 +19,8 @@ import java.util.List; import java.util.Map; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.KeyMatchPager; @@ -47,6 +49,8 @@ public class AdminKeymatchAction extends FessAdminAction { public static final String ROLE = "admin-keymatch"; + private static final Logger logger = LogManager.getLogger(AdminKeymatchAction.class); + // =================================================================================== // Attribute // ========= @@ -197,6 +201,7 @@ public HtmlResponse create(final CreateForm form) { saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); ComponentUtil.getKeyMatchHelper().update(); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -218,6 +223,7 @@ public HtmlResponse update(final EditForm form) { saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); ComponentUtil.getKeyMatchHelper().update(); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -240,6 +246,7 @@ public HtmlResponse delete(final EditForm form) { saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); ComponentUtil.getKeyMatchHelper().update(); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } 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 80a8f9ce2e..95280fc2d8 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 @@ -21,6 +21,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; @@ -52,6 +54,8 @@ public class AdminLabeltypeAction extends FessAdminAction { public static final String ROLE = "admin-labeltype"; + private static final Logger logger = LogManager.getLogger(AdminLabeltypeAction.class); + // =================================================================================== // Attribute // ========= @@ -211,6 +215,7 @@ public HtmlResponse create(final CreateForm form) { labelTypeService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -231,6 +236,7 @@ public HtmlResponse update(final EditForm form) { labelTypeService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -252,6 +258,7 @@ public HtmlResponse delete(final EditForm form) { labelTypeService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } 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 c7bf409753..7be3b130da 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.app.web.admin.pathmap; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.PathMapPager; @@ -43,6 +45,8 @@ public class AdminPathmapAction extends FessAdminAction { public static final String ROLE = "admin-pathmap"; + private static final Logger logger = LogManager.getLogger(AdminPathmapAction.class); + // =================================================================================== // Attribute // ========= @@ -186,6 +190,7 @@ public HtmlResponse create(final CreateForm form) { pathMappingService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -206,6 +211,7 @@ public HtmlResponse update(final EditForm form) { pathMappingService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -227,6 +233,7 @@ public HtmlResponse delete(final EditForm form) { pathMappingService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } 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 102f702e3d..88a65f9859 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.app.web.admin.relatedcontent; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; @@ -42,6 +44,8 @@ public class AdminRelatedcontentAction extends FessAdminAction { public static final String ROLE = "admin-relatedcontent"; + private static final Logger logger = LogManager.getLogger(AdminRelatedcontentAction.class); + // =================================================================================== // Attribute // ========= @@ -185,6 +189,7 @@ public HtmlResponse create(final CreateForm form) { relatedContentService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -205,6 +210,7 @@ public HtmlResponse update(final EditForm form) { relatedContentService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -226,6 +232,7 @@ public HtmlResponse delete(final EditForm form) { relatedContentService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } 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 6165bebf18..890ecd251c 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 @@ -21,6 +21,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -49,6 +51,8 @@ public class AdminRelatedqueryAction extends FessAdminAction { public static final String ROLE = "admin-relatedquery"; + private static final Logger logger = LogManager.getLogger(AdminRelatedqueryAction.class); + // =================================================================================== // Attribute // ========= @@ -200,6 +204,7 @@ public HtmlResponse create(final CreateForm form) { relatedQueryService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -220,6 +225,7 @@ public HtmlResponse update(final EditForm form) { relatedQueryService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -241,6 +247,7 @@ public HtmlResponse delete(final EditForm form) { relatedQueryService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } 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 d99a1827ba..c14c9ad9c4 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 @@ -20,6 +20,8 @@ import java.util.List; import java.util.Map; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.ReqHeaderPager; @@ -50,6 +52,8 @@ public class AdminReqheaderAction extends FessAdminAction { public static final String ROLE = "admin-reqheader"; + private static final Logger logger = LogManager.getLogger(AdminReqheaderAction.class); + // =================================================================================== // Attribute // ========= @@ -198,6 +202,7 @@ public HtmlResponse create(final CreateForm form) { requestHeaderService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -218,6 +223,7 @@ public HtmlResponse update(final EditForm form) { requestHeaderService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -239,6 +245,7 @@ public HtmlResponse delete(final EditForm form) { requestHeaderService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } 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 4984f5fc47..a4fd15fb3b 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 @@ -170,7 +170,7 @@ public HtmlResponse create(final CreateForm form) { roleService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { - logger.error("Failed to add {}", entity, e); + logger.warn("Failed to add {}", entity, e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -192,7 +192,7 @@ public HtmlResponse delete(final EditForm form) { roleService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { - logger.error("Failed to delete {}", entity, e); + logger.warn("Failed to delete {}", entity, e); throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), this::asDetailsHtml); } }).orElse(() -> { 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 08cd08e260..36dfc8b768 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 @@ -18,6 +18,8 @@ import java.text.MessageFormat; import java.util.Base64; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.SchedulerPager; @@ -47,6 +49,8 @@ public class AdminSchedulerAction extends FessAdminAction { public static final String ROLE = "admin-scheduler"; + private static final Logger logger = LogManager.getLogger(AdminSchedulerAction.class); + // =================================================================================== // Attribute // ========= @@ -225,6 +229,7 @@ public HtmlResponse create(final CreateForm form) { scheduledJobService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -245,6 +250,7 @@ public HtmlResponse update(final EditForm form) { scheduledJobService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -266,6 +272,7 @@ public HtmlResponse delete(final EditForm form) { scheduledJobService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -292,6 +299,7 @@ public HtmlResponse start(final EditForm form) { entity.start(); saveInfo(messages -> messages.addSuccessJobStarted(GLOBAL, entity.getName())); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> { messages.addErrorsFailedToStartJob(GLOBAL, entity.getName()); }, () -> asDetailsHtml(id)); @@ -316,6 +324,7 @@ public HtmlResponse stop(final EditForm form) { entity.stop(); saveInfo(messages -> messages.addSuccessJobStopped(GLOBAL, entity.getName())); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> { messages.addErrorsFailedToStopJob(GLOBAL, entity.getName()); }, () -> asDetailsHtml(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 ffe0af05b7..ac81ed2c1e 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 @@ -145,12 +145,12 @@ protected HtmlResponse doSearch(final ListForm form) { }); } catch (final InvalidQueryException e) { if (logger.isDebugEnabled()) { - logger.debug(e.getMessage(), e); + logger.debug("Invalid query: {}", form.q, e); } throwValidationError(e.getMessageCode(), this::asListHtml); } catch (final ResultOffsetExceededException e) { if (logger.isDebugEnabled()) { - logger.debug(e.getMessage(), e); + logger.debug("Invalid offset: {}", form.offset, e); } throwValidationError(messages -> messages.addErrorsResultSizeExceeded(GLOBAL), this::asListHtml); } @@ -215,6 +215,7 @@ public HtmlResponse delete(final DeleteForm form) { searchEngineClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), query); saveInfo(messages -> messages.addSuccessDeleteDocFromIndex(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsFailedToDeleteDocInAdmin(GLOBAL), this::asListHtml); } return asListHtml(); @@ -230,7 +231,7 @@ public HtmlResponse deleteall(final ListForm form) { saveInfo(messages -> messages.addSuccessDeleteDocFromIndex(GLOBAL)); } catch (final InvalidQueryException e) { if (logger.isDebugEnabled()) { - logger.debug(e.getMessage(), e); + logger.debug("Invalid query: {}", form.q, e); } throwValidationError(e.getMessageCode(), this::asListHtml); } @@ -283,7 +284,7 @@ public HtmlResponse create(final CreateForm form) { searchEngineClient.store(index, entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { - logger.error("Failed to add {}", entity, e); + logger.warn("Failed to add {}", entity, e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -320,7 +321,7 @@ public HtmlResponse update(final EditForm form) { searchEngineClient.store(index, entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { - logger.error("Failed to update {}", entity, e); + logger.warn("Failed to update {}", entity, e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } 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 ec49d00da8..456b747ec6 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 @@ -102,9 +102,7 @@ public HtmlResponse upload(final ItemForm form) { try { uploadObject(getObjectName(form.path, form.uploadFile.getFileName()), form.uploadFile); } catch (final StorageException e) { - if (logger.isDebugEnabled()) { - logger.debug("Failed to upload {}", form.uploadFile.getFileName(), e); - } + logger.warn("Failed to upload {}", form.uploadFile.getFileName(), e); throwValidationError(messages -> messages.addErrorsStorageFileUploadFailure(GLOBAL, form.uploadFile.getFileName()), () -> asListHtml(encodeId(form.path))); @@ -132,9 +130,7 @@ public ActionResponse download(final String id) { try { downloadObject(getObjectName(pi.getPath(), pi.getName()), out); } catch (final StorageException e) { - if (logger.isDebugEnabled()) { - logger.debug("Failed to download {}", pi.getName(), e); - } + logger.warn("Failed to download {}", pi.getName(), e); throwValidationError(messages -> messages.addErrorsStorageFileDownloadFailure(GLOBAL, pi.getName()), () -> asListHtml(encodeId(pi.getPath()))); } @@ -152,7 +148,7 @@ public HtmlResponse delete(final String id) { try { deleteObject(objectName); } catch (final StorageException e) { - logger.debug("Failed to delete {}", pi.getName(), e); + logger.warn("Failed to delete {}", pi.getName(), e); throwValidationError(messages -> messages.addErrorsFailedToDeleteFile(GLOBAL, pi.getName()), () -> asListHtml(encodeId(pi.getPath()))); } @@ -186,7 +182,7 @@ public HtmlResponse updateTags(final TagForm form) { try { updateObjectTags(objectName, form.tags); } catch (final StorageException e) { - logger.debug("Failed to update tags in {}", form.path, e); + logger.warn("Failed to update tags in {}", form.path, e); throwValidationError(messages -> messages.addErrorsStorageTagsUpdateFailure(GLOBAL, objectName), () -> asEditTagsHtml(form.path, form.name)); } 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 e7e424ee30..acb24fa6ee 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 @@ -218,7 +218,7 @@ public HtmlResponse create(final CreateForm form) { userService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { - logger.error("Failed to add {}", entity, e); + logger.warn("Failed to add {}", entity, e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -241,7 +241,7 @@ public HtmlResponse update(final EditForm form) { userService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { - logger.error("Failed to update {}", entity, e); + logger.warn("Failed to update {}", entity, e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -268,7 +268,7 @@ public HtmlResponse delete(final EditForm form) { userService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { - logger.error("Failed to delete {}", entity, e); + logger.warn("Failed to delete {}", entity, e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asDetailsHtml); } 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 87bb9f2c23..8faa82b4cd 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 @@ -21,6 +21,8 @@ import java.util.Locale; import java.util.Map; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; import org.codelibs.fess.app.pager.WebAuthPager; @@ -50,6 +52,8 @@ public class AdminWebauthAction extends FessAdminAction { public static final String ROLE = "admin-webauth"; + private static final Logger logger = LogManager.getLogger(AdminWebauthAction.class); + // =================================================================================== // Attribute // ========= @@ -201,6 +205,7 @@ public HtmlResponse create(final CreateForm form) { webAuthenticationService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -221,6 +226,7 @@ public HtmlResponse update(final EditForm form) { webAuthenticationService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -242,6 +248,7 @@ public HtmlResponse delete(final EditForm form) { webAuthenticationService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } 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 b1a9b682e9..91fae521f3 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 @@ -21,6 +21,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.annotation.Secured; @@ -55,6 +57,8 @@ public class AdminWebconfigAction extends FessAdminAction { public static final String ROLE = "admin-webconfig"; + private static final Logger logger = LogManager.getLogger(AdminWebconfigAction.class); + // =================================================================================== // Attribute // ========= @@ -231,6 +235,7 @@ public HtmlResponse create(final CreateForm form) { webConfigService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -251,6 +256,7 @@ public HtmlResponse update(final EditForm form) { webConfigService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } @@ -272,6 +278,7 @@ public HtmlResponse delete(final EditForm form) { webConfigService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationError(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), this::asEditHtml); } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java b/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java index 11dc59b841..1feb76be85 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java @@ -215,7 +215,7 @@ protected String crawlingConfigInternal(final CrawlingConfigForm form) { } return configName; } catch (final Exception e) { - logger.error("Failed to create crawling config: {}", form.crawlingConfigPath, e); + logger.warn("Failed to create crawling config: {}", form.crawlingConfigPath, e); throwValidationError(messages -> messages.addErrorsFailedToCreateCrawlingConfigAtWizard(GLOBAL), () -> asHtml(path_AdminWizard_AdminWizardConfigJsp)); return null; 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 c3f256521a..8d19003e55 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 @@ -21,6 +21,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.AccessTokenPager; @@ -44,6 +46,8 @@ */ public class ApiAdminAccesstokenAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminAccesstokenAction.class); + // =================================================================================== // Attribute // ========= @@ -82,6 +86,7 @@ public JsonResponse settings(final SearchBody body) { try { accessTokenService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -101,6 +106,7 @@ public JsonResponse settings(final SearchBody body) { try { accessTokenService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -119,6 +125,7 @@ public JsonResponse settings(final SearchBody body) { accessTokenService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } }).orElse(() -> { 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 c79e427ff6..5dc7d8fc0d 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 @@ -29,6 +29,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.concurrent.CommonPoolUtil; import org.codelibs.fess.app.pager.BadWordPager; import org.codelibs.fess.app.service.BadWordService; @@ -50,6 +52,8 @@ public class ApiAdminBadwordAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminBadwordAction.class); + @Resource private BadWordService badWordService; @@ -96,6 +100,7 @@ public JsonResponse settings(final SearchBody body) { badWordService.store(entity); suggestHelper.addBadWord(entity.getSuggestWord(), false); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e))); } return asJson(new ApiResult.ApiUpdateResponse().id(entity.getId()).created(true).status(ApiResult.Status.OK).result()); @@ -111,6 +116,7 @@ public JsonResponse settings(final SearchBody body) { badWordService.store(entity); suggestHelper.storeAllBadWords(false); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -132,12 +138,14 @@ public JsonResponse settings(final SearchBody body) { suggestHelper.deleteBadWord(entity.getSuggestWord()); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } }).orElse(() -> { throwValidationErrorApi(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id)); }); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } return asJson(new ApiResult.ApiUpdateResponse().id(id).created(false).status(ApiResult.Status.OK).result()); @@ -168,6 +176,7 @@ public JsonResponse settings(final SearchBody body) { try (Writer writer = new BufferedWriter(new OutputStreamWriter(Files.newOutputStream(tempFile), getCsvEncoding()))) { badWordService.exportCsv(writer); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsFailedToDownloadBadwordFile(GLOBAL)); } try (InputStream in = Files.newInputStream(tempFile)) { diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java index 5ef1512ad9..03307d0259 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java @@ -20,6 +20,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.beans.util.CopyOptions; import org.codelibs.fess.app.pager.BoostDocPager; import org.codelibs.fess.app.service.BoostDocumentRuleService; @@ -42,6 +44,8 @@ */ public class ApiAdminBoostdocAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminBoostdocAction.class); + // =================================================================================== // Attribute // ========= @@ -82,6 +86,7 @@ public JsonResponse settings(final SearchBody body) { try { boostDocumentRuleService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -101,6 +106,7 @@ public JsonResponse settings(final SearchBody body) { try { boostDocumentRuleService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -119,6 +125,7 @@ public JsonResponse settings(final SearchBody body) { boostDocumentRuleService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } }).orElse(() -> { diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java index 60a3489d1f..ee0307569f 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java @@ -18,6 +18,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.app.pager.CrawlingInfoPager; import org.codelibs.fess.app.service.CrawlingInfoService; import org.codelibs.fess.app.web.api.ApiResult; @@ -37,6 +39,8 @@ */ public class ApiAdminCrawlinginfoAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminCrawlinginfoAction.class); + // =================================================================================== // Attribute // ========= @@ -77,6 +81,7 @@ public JsonResponse logs(final SearchBody body) { crawlingInfoService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } }).orElse(() -> { @@ -92,6 +97,7 @@ public JsonResponse logs(final SearchBody body) { crawlingInfoService.deleteOldSessions(processHelper.getRunningSessionIdSet()); saveInfo(messages -> messages.addSuccessCrawlingInfoDeleteAll(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } return asJson(new ApiResponse().status(Status.OK).result()); 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 de0c6ad3ab..767249b2d7 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 @@ -21,6 +21,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.DataConfigPager; @@ -45,6 +47,8 @@ */ public class ApiAdminDataconfigAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminDataconfigAction.class); + // =================================================================================== // Attribute // ========= @@ -85,6 +89,7 @@ public JsonResponse settings(final SearchBody body) { try { dataConfigService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -105,6 +110,7 @@ public JsonResponse settings(final SearchBody body) { try { dataConfigService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -123,6 +129,7 @@ public JsonResponse settings(final SearchBody body) { dataConfigService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } }).orElse(() -> { 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 92fc1ece44..72ae47365a 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 @@ -22,6 +22,8 @@ import java.io.InputStream; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.app.pager.KuromojiPager; import org.codelibs.fess.app.service.KuromojiService; import org.codelibs.fess.app.web.CrudMode; @@ -38,6 +40,8 @@ public class ApiAdminDictKuromojiAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminDictKuromojiAction.class); + @Resource private KuromojiService kuromojiService; @@ -123,6 +127,7 @@ public class ApiAdminDictKuromojiAction extends FessApiAdminAction { try (InputStream inputStream = form.kuromojiFile.getInputStream()) { file.update(inputStream); } catch (final IOException e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsFailedToUploadProtwordsFile(GLOBAL)); } return asJson(new ApiResult.ApiResponse().status(ApiResult.Status.OK).result()); 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 396c248b21..b14aae8f2b 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 @@ -22,6 +22,8 @@ import java.io.InputStream; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.app.pager.CharMappingPager; import org.codelibs.fess.app.service.CharMappingService; import org.codelibs.fess.app.web.CrudMode; @@ -38,6 +40,8 @@ public class ApiAdminDictMappingAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminDictMappingAction.class); + @Resource private CharMappingService charMappingService; @@ -123,6 +127,7 @@ public class ApiAdminDictMappingAction extends FessApiAdminAction { try (InputStream inputStream = form.charMappingFile.getInputStream()) { file.update(inputStream); } catch (final IOException e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsFailedToUploadProtwordsFile(GLOBAL)); } return asJson(new ApiResult.ApiResponse().status(ApiResult.Status.OK).result()); 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 fd48ef70f1..5066a2e7b6 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 @@ -22,6 +22,8 @@ import java.io.InputStream; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.app.pager.ProtwordsPager; import org.codelibs.fess.app.service.ProtwordsService; import org.codelibs.fess.app.web.CrudMode; @@ -37,6 +39,9 @@ import jakarta.annotation.Resource; public class ApiAdminDictProtwordsAction extends FessApiAdminAction { + + private static final Logger logger = LogManager.getLogger(ApiAdminDictProtwordsAction.class); + @Resource private ProtwordsService protwordsService; @@ -122,6 +127,7 @@ public class ApiAdminDictProtwordsAction extends FessApiAdminAction { try (InputStream inputStream = form.protwordsFile.getInputStream()) { file.update(inputStream); } catch (final IOException e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsFailedToUploadProtwordsFile(GLOBAL)); } return asJson(new ApiResult.ApiResponse().status(ApiResult.Status.OK).result()); 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 56048d04e6..2c6a3d085c 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 @@ -22,6 +22,8 @@ import java.io.InputStream; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.app.pager.StemmerOverridePager; import org.codelibs.fess.app.service.StemmerOverrideService; import org.codelibs.fess.app.web.CrudMode; @@ -38,6 +40,8 @@ public class ApiAdminDictStemmeroverrideAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminDictStemmeroverrideAction.class); + @Resource private StemmerOverrideService stemmerOverrideService; @@ -123,6 +127,7 @@ public class ApiAdminDictStemmeroverrideAction extends FessApiAdminAction { try (InputStream inputStream = form.stemmerOverrideFile.getInputStream()) { file.update(inputStream); } catch (final IOException e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsFailedToUploadProtwordsFile(GLOBAL)); } return asJson(new ApiResult.ApiResponse().status(ApiResult.Status.OK).result()); 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 6faef2d293..fca699985a 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 @@ -22,6 +22,8 @@ import java.io.InputStream; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.app.pager.StopwordsPager; import org.codelibs.fess.app.service.StopwordsService; import org.codelibs.fess.app.web.CrudMode; @@ -37,6 +39,9 @@ import jakarta.annotation.Resource; public class ApiAdminDictStopwordsAction extends FessApiAdminAction { + + private static final Logger logger = LogManager.getLogger(ApiAdminDictStopwordsAction.class); + @Resource private StopwordsService stopwordsService; @@ -122,6 +127,7 @@ public class ApiAdminDictStopwordsAction extends FessApiAdminAction { try (InputStream inputStream = form.stopwordsFile.getInputStream()) { file.update(inputStream); } catch (final IOException e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsFailedToUploadStopwordsFile(GLOBAL)); } return asJson(new ApiResult.ApiResponse().status(ApiResult.Status.OK).result()); 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 d2879fb997..44981607f9 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 @@ -22,6 +22,8 @@ import java.io.InputStream; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.app.pager.SynonymPager; import org.codelibs.fess.app.service.SynonymService; import org.codelibs.fess.app.web.CrudMode; @@ -38,6 +40,8 @@ public class ApiAdminDictSynonymAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminDictSynonymAction.class); + @Resource private SynonymService synonymService; @@ -123,6 +127,7 @@ public class ApiAdminDictSynonymAction extends FessApiAdminAction { try (InputStream inputStream = form.synonymFile.getInputStream()) { file.update(inputStream); } catch (final IOException e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsFailedToUploadProtwordsFile(GLOBAL)); } return asJson(new ApiResult.ApiResponse().status(ApiResult.Status.OK).result()); 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 9e058f813f..0f09fa52fe 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 @@ -20,6 +20,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.app.pager.DuplicateHostPager; import org.codelibs.fess.app.service.DuplicateHostService; import org.codelibs.fess.app.web.CrudMode; @@ -40,6 +42,8 @@ */ public class ApiAdminDuplicatehostAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminDuplicatehostAction.class); + // =================================================================================== // Attribute // ========= @@ -80,6 +84,7 @@ public JsonResponse settings(final SearchBody body) { try { duplicateHostService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -100,6 +105,7 @@ public JsonResponse settings(final SearchBody body) { try { duplicateHostService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -118,6 +124,7 @@ public JsonResponse settings(final SearchBody body) { duplicateHostService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } }).orElse(() -> { 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 0003a881f5..31c69c674e 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 @@ -30,6 +30,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.concurrent.CommonPoolUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; @@ -54,6 +56,8 @@ public class ApiAdminElevatewordAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminElevatewordAction.class); + @Resource private ElevateWordService elevateWordService; @@ -104,6 +108,7 @@ public JsonResponse settings(final SearchBody body) { suggestHelper.addElevateWord(entity.getSuggestWord(), entity.getReading(), entity.getLabelTypeValues(), entity.getPermissions(), entity.getBoost(), false); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e))); } return asJson(new ApiResult.ApiUpdateResponse().id(entity.getId()).created(true).status(ApiResult.Status.OK).result()); @@ -120,6 +125,7 @@ public JsonResponse settings(final SearchBody body) { suggestHelper.deleteAllElevateWord(false); suggestHelper.storeAllElevateWords(false); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -141,12 +147,14 @@ public JsonResponse settings(final SearchBody body) { suggestHelper.deleteElevateWord(entity.getSuggestWord(), false); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } }).orElse(() -> { throwValidationErrorApi(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id)); }); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } return asJson(new ApiResult.ApiUpdateResponse().id(id).created(false).status(ApiResult.Status.OK).result()); @@ -177,6 +185,7 @@ public JsonResponse settings(final SearchBody body) { try (Writer writer = new BufferedWriter(new OutputStreamWriter(Files.newOutputStream(tempFile), getCsvEncoding()))) { elevateWordService.exportCsv(writer); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsFailedToDownloadElevateFile(GLOBAL)); } try (InputStream in = Files.newInputStream(tempFile)) { diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java index 5aa83ffe21..a29b2b9b51 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java @@ -18,6 +18,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.app.pager.FailureUrlPager; import org.codelibs.fess.app.service.FailureUrlService; import org.codelibs.fess.app.web.api.ApiResult; @@ -37,6 +39,8 @@ */ public class ApiAdminFailureurlAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminFailureurlAction.class); + // =================================================================================== // Attribute // ========= @@ -79,6 +83,7 @@ public JsonResponse logs(final SearchBody body) { failureUrlService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } }).orElse(() -> { @@ -95,6 +100,7 @@ public JsonResponse logs(final SearchBody body) { failureUrlPager.clear(); saveInfo(messages -> messages.addSuccessFailureUrlDeleteAll(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } return asJson(new ApiResponse().status(Status.OK).result()); 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 7724c4a3a0..7151c13639 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 @@ -20,6 +20,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.app.pager.FileAuthPager; import org.codelibs.fess.app.service.FileAuthenticationService; import org.codelibs.fess.app.service.FileConfigService; @@ -42,6 +44,8 @@ */ public class ApiAdminFileauthAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminFileauthAction.class); + // =================================================================================== // Attribute // ========= @@ -88,6 +92,7 @@ public JsonResponse settings(final SearchBody body) { try { fileAuthService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -108,6 +113,7 @@ public JsonResponse settings(final SearchBody body) { try { fileAuthService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -126,6 +132,7 @@ public JsonResponse settings(final SearchBody body) { fileAuthService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } }).orElse(() -> { 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 3888bc474a..238ba2bf56 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 @@ -21,6 +21,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.FileConfigPager; @@ -45,6 +47,8 @@ */ public class ApiAdminFileconfigAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminFileconfigAction.class); + // =================================================================================== // Attribute // ========= @@ -85,6 +89,7 @@ public JsonResponse settings(final SearchBody body) { try { fileConfigService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -105,6 +110,7 @@ public JsonResponse settings(final SearchBody body) { try { fileConfigService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -123,6 +129,7 @@ public JsonResponse settings(final SearchBody body) { fileConfigService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } }).orElse(() -> { 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 07c1a3d805..5c49c566be 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 @@ -21,6 +21,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.app.pager.GroupPager; import org.codelibs.fess.app.service.GroupService; import org.codelibs.fess.app.web.CrudMode; @@ -35,6 +37,8 @@ public class ApiAdminGroupAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminGroupAction.class); + @Resource private GroupService groupService; @@ -75,6 +79,7 @@ public JsonResponse settings(final SearchBody body) { groupService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e))); } return asJson(new ApiResult.ApiUpdateResponse().id(entity.getId()).created(true).status(ApiResult.Status.OK).result()); @@ -116,6 +121,7 @@ public JsonResponse settings(final SearchBody body) { groupService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } return asJson(new ApiResult.ApiUpdateResponse().id(id).created(false).status(ApiResult.Status.OK).result()); diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java index 436ceae5d4..ab774f3f41 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java @@ -18,6 +18,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.app.pager.JobLogPager; import org.codelibs.fess.app.service.JobLogService; import org.codelibs.fess.app.web.api.ApiResult; @@ -36,6 +38,8 @@ */ public class ApiAdminJoblogAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminJoblogAction.class); + // =================================================================================== // Attribute // ========= @@ -73,6 +77,7 @@ public JsonResponse logs(final SearchBody body) { jobLogService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } }).orElse(() -> { 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 7cec7435c6..9f7d726c8f 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 @@ -20,6 +20,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.app.pager.KeyMatchPager; import org.codelibs.fess.app.service.KeyMatchService; import org.codelibs.fess.app.web.CrudMode; @@ -40,6 +42,8 @@ */ public class ApiAdminKeymatchAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminKeymatchAction.class); + // =================================================================================== // Attribute // ========= @@ -80,6 +84,7 @@ public JsonResponse settings(final SearchBody body) { try { keyMatchService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -100,6 +105,7 @@ public JsonResponse settings(final SearchBody body) { try { keyMatchService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -118,6 +124,7 @@ public JsonResponse settings(final SearchBody body) { keyMatchService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } }).orElse(() -> { 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 e0a86cad93..27323b4c9b 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 @@ -21,6 +21,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.LabelTypePager; @@ -45,6 +47,8 @@ */ public class ApiAdminLabeltypeAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminLabeltypeAction.class); + // =================================================================================== // Attribute // ========= @@ -85,6 +89,7 @@ public JsonResponse settings(final SearchBody body) { try { labelTypeService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -105,6 +110,7 @@ public JsonResponse settings(final SearchBody body) { try { labelTypeService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -123,6 +129,7 @@ public JsonResponse settings(final SearchBody body) { labelTypeService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } }).orElse(() -> { 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 9d6f8a0b4a..ce65187180 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 @@ -20,6 +20,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.PathMapPager; import org.codelibs.fess.app.service.PathMappingService; @@ -34,6 +36,8 @@ public class ApiAdminPathmapAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminPathmapAction.class); + @Resource private PathMappingService pathMappingService; @@ -74,6 +78,7 @@ public JsonResponse settings(final SearchBody body) { pathMappingService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e))); } return asJson(new ApiResult.ApiUpdateResponse().id(entity.getId()).created(true).status(ApiResult.Status.OK).result()); @@ -93,6 +98,7 @@ public JsonResponse settings(final SearchBody body) { try { pathMappingService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e))); } return asJson(new ApiResult.ApiUpdateResponse().id(entity.getId()).created(false).status(ApiResult.Status.OK).result()); @@ -109,6 +115,7 @@ public JsonResponse settings(final SearchBody body) { pathMappingService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } return asJson(new ApiResult.ApiUpdateResponse().id(id).created(false).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 5baeef06c0..75de03db56 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 @@ -20,6 +20,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.app.pager.RelatedContentPager; import org.codelibs.fess.app.service.RelatedContentService; import org.codelibs.fess.app.web.CrudMode; @@ -37,6 +39,8 @@ public class ApiAdminRelatedcontentAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminRelatedcontentAction.class); + // =================================================================================== // Attribute // ========= @@ -78,6 +82,7 @@ public JsonResponse settings(final SearchBody body) { try { relatedContentService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -98,6 +103,7 @@ public JsonResponse settings(final SearchBody body) { try { relatedContentService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -116,6 +122,7 @@ public JsonResponse settings(final SearchBody body) { relatedContentService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } }).orElse(() -> { 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 6df35c2e07..79eebcd764 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 @@ -21,6 +21,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.RelatedQueryPager; @@ -40,6 +42,8 @@ public class ApiAdminRelatedqueryAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminRelatedqueryAction.class); + // =================================================================================== // Attribute // ========= @@ -80,6 +84,7 @@ public JsonResponse settings(final SearchBody body) { try { relatedQueryService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -100,6 +105,7 @@ public JsonResponse settings(final SearchBody body) { try { relatedQueryService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -118,6 +124,7 @@ public JsonResponse settings(final SearchBody body) { relatedQueryService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } }).orElse(() -> { 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 b289622972..17e8354c7a 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 @@ -20,6 +20,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.app.pager.ReqHeaderPager; import org.codelibs.fess.app.service.RequestHeaderService; import org.codelibs.fess.app.service.WebConfigService; @@ -42,6 +44,8 @@ */ public class ApiAdminReqheaderAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminReqheaderAction.class); + // =================================================================================== // Attribute // ========= @@ -88,6 +92,7 @@ public JsonResponse settings(final SearchBody body) { try { reqHeaderService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -108,6 +113,7 @@ public JsonResponse settings(final SearchBody body) { try { reqHeaderService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -126,6 +132,7 @@ public JsonResponse settings(final SearchBody body) { reqHeaderService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } }).orElse(() -> { 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 bf1dbadfba..4df25b4108 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 @@ -20,6 +20,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.app.pager.RolePager; import org.codelibs.fess.app.service.RoleService; import org.codelibs.fess.app.web.CrudMode; @@ -33,6 +35,8 @@ public class ApiAdminRoleAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminRoleAction.class); + @Resource private RoleService roleService; @@ -71,6 +75,7 @@ public JsonResponse settings(final SearchBody body) { try { roleService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e))); } return asJson(new ApiResult.ApiUpdateResponse().id(entity.getId()).created(true).status(ApiResult.Status.OK).result()); @@ -90,6 +95,7 @@ public JsonResponse settings(final SearchBody body) { try { roleService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e))); } return asJson(new ApiResult.ApiUpdateResponse().id(entity.getId()).created(false).status(ApiResult.Status.OK).result()); @@ -105,6 +111,7 @@ public JsonResponse settings(final SearchBody body) { try { roleService.delete(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } return asJson(new ApiResult.ApiUpdateResponse().id(id).created(false).status(ApiResult.Status.OK).result()); 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 6647733778..0688d4db84 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 @@ -20,6 +20,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.SchedulerPager; import org.codelibs.fess.app.service.ScheduledJobService; @@ -37,6 +39,8 @@ public class ApiAdminSchedulerAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminSchedulerAction.class); + @Resource private ScheduledJobService scheduledJobService; @@ -76,6 +80,7 @@ public HtmlResponse index() { try { entity.stop(); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> { messages.addErrorsFailedToStopJob(GLOBAL, entity.getName()); }); @@ -125,6 +130,7 @@ public JsonResponse settings(final SearchBody body) { scheduledJobService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e))); } return asJson(new ApiResult.ApiUpdateResponse().id(entity.getId()).created(true).status(ApiResult.Status.OK).result()); @@ -144,6 +150,7 @@ public JsonResponse settings(final SearchBody body) { try { scheduledJobService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e))); } return asJson(new ApiResult.ApiUpdateResponse().id(entity.getId()).created(false).status(ApiResult.Status.OK).result()); @@ -160,6 +167,7 @@ public JsonResponse settings(final SearchBody body) { scheduledJobService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } return asJson(new ApiResult.ApiUpdateResponse().id(id).created(false).status(ApiResult.Status.OK).result()); 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 db46fed4db..082f3fba1b 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 @@ -87,12 +87,12 @@ public JsonResponse docs(final SearchBody body) { return asJson(new ApiDocsResponse().renderData(renderData).status(Status.OK).result()); } catch (final InvalidQueryException e) { if (logger.isDebugEnabled()) { - logger.debug(e.getMessage(), e); + logger.debug("Invalid query: {}", body.q, e); } throwValidationErrorApi(e.getMessageCode()); } catch (final ResultOffsetExceededException e) { if (logger.isDebugEnabled()) { - logger.debug(e.getMessage(), e); + logger.debug("Invalid offset: {}", body.offset, e); } throwValidationErrorApi(messages -> messages.addErrorsResultSizeExceeded(GLOBAL)); } @@ -133,7 +133,7 @@ public JsonResponse docs(final SearchBody body) { searchEngineClient.store(index, entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { - logger.error("Failed to add {}", entity, e); + logger.warn("Failed to add {}", entity, e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -174,7 +174,7 @@ public JsonResponse docs(final SearchBody body) { searchEngineClient.store(index, entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); } catch (final Exception e) { - logger.error("Failed to update {}", entity, e); + logger.warn("Failed to update {}", entity, e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -194,6 +194,7 @@ public JsonResponse docs(final SearchBody body) { searchEngineClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), query); saveInfo(messages -> messages.addSuccessDeleteDocFromIndex(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsFailedToDeleteDocInAdmin(GLOBAL)); } return asJson(new ApiResponse().status(Status.OK).result()); diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/storage/ApiAdminStorageAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/storage/ApiAdminStorageAction.java index 71936fcd1b..8665fedca3 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/storage/ApiAdminStorageAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/storage/ApiAdminStorageAction.java @@ -71,9 +71,7 @@ public JsonResponse list(final OptionalThing id) { try { downloadObject(getObjectName(pi.getPath(), pi.getName()), out); } catch (final StorageException e) { - if (logger.isDebugEnabled()) { - logger.debug("Failed to download {}", id, e); - } + logger.warn("Failed to download {}", id, e); throwValidationErrorApi(messages -> messages.addErrorsStorageFileDownloadFailure(GLOBAL, pi.getName())); } }); @@ -92,9 +90,7 @@ public JsonResponse list(final OptionalThing id) { saveInfo(messages -> messages.addSuccessDeleteFile(GLOBAL, pi.getName())); return asJson(new ApiResult.ApiResponse().status(ApiResult.Status.OK).result()); } catch (final StorageException e) { - if (logger.isDebugEnabled()) { - logger.debug("Failed to delete {}", id, e); - } + logger.warn("Failed to delete {}", id, e); throwValidationErrorApi(messages -> messages.addErrorsFailedToDeleteFile(GLOBAL, pi.getName())); } return null; @@ -114,9 +110,7 @@ public JsonResponse list(final OptionalThing id) { saveInfo(messages -> messages.addSuccessUploadFileToStorage(GLOBAL, fileName)); return asJson(new ApiResult.ApiResponse().status(ApiResult.Status.OK).result()); } catch (final StorageException e) { - if (logger.isDebugEnabled()) { - logger.debug("Failed to upload {}", fileName, e); - } + logger.warn("Failed to upload {}", fileName, e); throwValidationErrorApi(messages -> messages.addErrorsStorageFileUploadFailure(GLOBAL, fileName)); } return null; 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 6880777d60..99c12d9f4b 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 @@ -21,6 +21,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.app.pager.UserPager; import org.codelibs.fess.app.service.UserService; import org.codelibs.fess.app.web.CrudMode; @@ -34,6 +36,8 @@ public class ApiAdminUserAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminUserAction.class); + @Resource private UserService userService; @@ -73,6 +77,7 @@ public JsonResponse settings(final SearchBody body) { userService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e))); } return asJson(new ApiResult.ApiUpdateResponse().id(entity.getId()).created(true).status(ApiResult.Status.OK).result()); @@ -93,6 +98,7 @@ public JsonResponse settings(final SearchBody body) { try { userService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e))); } return asJson(new ApiResult.ApiUpdateResponse().id(entity.getId()).created(false).status(ApiResult.Status.OK).result()); @@ -114,6 +120,7 @@ public JsonResponse settings(final SearchBody body) { userService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } return asJson(new ApiResult.ApiUpdateResponse().id(id).created(false).status(ApiResult.Status.OK).result()); 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 0c8171311b..227b96a2a9 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 @@ -20,6 +20,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.fess.app.pager.WebAuthPager; import org.codelibs.fess.app.service.WebAuthenticationService; import org.codelibs.fess.app.service.WebConfigService; @@ -42,6 +44,8 @@ */ public class ApiAdminWebauthAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminWebauthAction.class); + // =================================================================================== // Attribute // ========= @@ -88,6 +92,7 @@ public JsonResponse settings(final SearchBody body) { try { webAuthService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -108,6 +113,7 @@ public JsonResponse settings(final SearchBody body) { try { webAuthService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -126,6 +132,7 @@ public JsonResponse settings(final SearchBody body) { webAuthService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } }).orElse(() -> { 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 c06b08db4f..161f511716 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 @@ -21,6 +21,8 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.WebConfigPager; @@ -45,6 +47,8 @@ */ public class ApiAdminWebconfigAction extends FessApiAdminAction { + private static final Logger logger = LogManager.getLogger(ApiAdminWebconfigAction.class); + // =================================================================================== // Attribute // ========= @@ -85,6 +89,7 @@ public JsonResponse settings(final SearchBody body) { try { webConfigService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -105,6 +110,7 @@ public JsonResponse settings(final SearchBody body) { try { webConfigService.store(entity); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e))); } return entity; @@ -123,6 +129,7 @@ public JsonResponse settings(final SearchBody body) { webConfigService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); } catch (final Exception e) { + logger.warn("Failed to process a request.", e); throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); } }).orElse(() -> { diff --git a/src/main/java/org/codelibs/fess/app/web/login/LoginAction.java b/src/main/java/org/codelibs/fess/app/web/login/LoginAction.java index 1c9a51ee42..b88a20215b 100644 --- a/src/main/java/org/codelibs/fess/app/web/login/LoginAction.java +++ b/src/main/java/org/codelibs/fess/app/web/login/LoginAction.java @@ -86,6 +86,9 @@ public HtmlResponse login(final LoginForm form) { getSession().ifPresent(session -> session.setAttribute(INVALID_OLD_PASSWORD, password)); return asHtml(virtualHost(path_Login_NewpasswordJsp)); } catch (final LoginFailureException lfe) { + if (logger.isDebugEnabled()) { + logger.debug("Login is failed.", lfe); + } activityHelper.loginFailure(OptionalThing.of(new LocalUserCredential(username, password))); throwValidationError(messages -> messages.addErrorsLoginError(GLOBAL), () -> asIndexPage(form)); } 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 50fe2172c1..ef0400bd90 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 @@ -71,7 +71,7 @@ public HtmlResponse changePassword(final ProfileForm form) { userService.changePassword(username, form.newPassword); saveInfo(messages -> messages.addSuccessChangedPassword(GLOBAL)); } catch (final Exception e) { - logger.error("Failed to change password for {}", username, e); + logger.warn("Failed to change password for {}", username, e); throwValidationError(messages -> messages.addErrorsFailedToChangePassword(GLOBAL), toIndexPage); } return redirect(getClass()); From 129418d44cd055f323d1b49d861015482098c5b3 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Fri, 29 Dec 2023 14:42:58 +0900 Subject: [PATCH 04/69] fix #2791 Updated byte display in log messages for detailed size representation with decimal precision --- .../org/codelibs/fess/util/MemoryUtil.java | 37 +++++++++++++++++-- .../codelibs/fess/util/MemoryUtilTest.java | 23 ++++++++++++ 2 files changed, 56 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/codelibs/fess/util/MemoryUtil.java b/src/main/java/org/codelibs/fess/util/MemoryUtil.java index d488b1b823..7a3fb0effd 100644 --- a/src/main/java/org/codelibs/fess/util/MemoryUtil.java +++ b/src/main/java/org/codelibs/fess/util/MemoryUtil.java @@ -15,14 +15,21 @@ */ package org.codelibs.fess.util; +import static org.apache.commons.io.FileUtils.ONE_EB_BI; +import static org.apache.commons.io.FileUtils.ONE_GB_BI; +import static org.apache.commons.io.FileUtils.ONE_KB_BI; +import static org.apache.commons.io.FileUtils.ONE_MB_BI; +import static org.apache.commons.io.FileUtils.ONE_PB_BI; +import static org.apache.commons.io.FileUtils.ONE_TB_BI; + +import java.math.BigDecimal; +import java.math.BigInteger; import java.time.LocalDateTime; import java.time.ZonedDateTime; import java.util.Collection; import java.util.Date; import java.util.Map; - -import org.apache.commons.io.FileUtils; -import org.codelibs.core.lang.StringUtil; +import java.util.Objects; public final class MemoryUtil { private MemoryUtil() { @@ -39,7 +46,29 @@ public static String getMemoryUsageLog() { } public static String byteCountToDisplaySize(final long size) { - return FileUtils.byteCountToDisplaySize(size).replace(" ", StringUtil.EMPTY); + return byteCountToDisplaySize(BigInteger.valueOf(size)); + } + + private static String byteCountToDisplaySize(final BigInteger size) { + Objects.requireNonNull(size, "size"); + final String displaySize; + + if (size.divide(ONE_EB_BI).compareTo(BigInteger.ZERO) > 0) { + displaySize = new BigDecimal(size.divide(ONE_PB_BI)).divide(BigDecimal.valueOf(1000)) + "EB"; + } else if (size.divide(ONE_PB_BI).compareTo(BigInteger.ZERO) > 0) { + displaySize = new BigDecimal(size.divide(ONE_TB_BI)).divide(BigDecimal.valueOf(1000)) + "PB"; + } else if (size.divide(ONE_TB_BI).compareTo(BigInteger.ZERO) > 0) { + displaySize = new BigDecimal(size.divide(ONE_GB_BI)).divide(BigDecimal.valueOf(1000)) + "TB"; + } else if (size.divide(ONE_GB_BI).compareTo(BigInteger.ZERO) > 0) { + displaySize = new BigDecimal(size.divide(ONE_MB_BI)).divide(BigDecimal.valueOf(1000)) + "GB"; + } else if (size.divide(ONE_MB_BI).compareTo(BigInteger.ZERO) > 0) { + displaySize = new BigDecimal(size.divide(ONE_KB_BI)).divide(BigDecimal.valueOf(1000)) + "MB"; + } else if (size.divide(ONE_KB_BI).compareTo(BigInteger.ZERO) > 0) { + displaySize = new BigDecimal(size).divide(BigDecimal.valueOf(1000)) + "KB"; + } else { + displaySize = size + "bytes"; + } + return displaySize; } public static long getUsedMemory() { diff --git a/src/test/java/org/codelibs/fess/util/MemoryUtilTest.java b/src/test/java/org/codelibs/fess/util/MemoryUtilTest.java index 046dc8ebbe..f4432810a4 100644 --- a/src/test/java/org/codelibs/fess/util/MemoryUtilTest.java +++ b/src/test/java/org/codelibs/fess/util/MemoryUtilTest.java @@ -19,6 +19,7 @@ import java.time.ZonedDateTime; import java.util.Date; +import org.apache.commons.io.FileUtils; import org.codelibs.core.collection.Maps; import org.codelibs.fess.unit.UnitFessTestCase; import org.codelibs.sai.internal.ir.debug.ObjectSizeCalculator; @@ -27,6 +28,28 @@ public class MemoryUtilTest extends UnitFessTestCase { + public void test_byteCountToDisplaySize() { + assertEquals("0bytes", MemoryUtil.byteCountToDisplaySize(0L)); + assertEquals("999bytes", MemoryUtil.byteCountToDisplaySize(999L)); + assertEquals("1000bytes", MemoryUtil.byteCountToDisplaySize(1000L)); + assertEquals("1.024KB", MemoryUtil.byteCountToDisplaySize(FileUtils.ONE_KB)); + assertEquals("999.999KB", MemoryUtil.byteCountToDisplaySize(999_999L)); + assertEquals("1000KB", MemoryUtil.byteCountToDisplaySize(1000_000L)); + assertEquals("1.024MB", MemoryUtil.byteCountToDisplaySize(FileUtils.ONE_MB)); + assertEquals("976.562MB", MemoryUtil.byteCountToDisplaySize(999_999_999L)); + assertEquals("976.562MB", MemoryUtil.byteCountToDisplaySize(1000_000_000L)); + assertEquals("1.024GB", MemoryUtil.byteCountToDisplaySize(FileUtils.ONE_GB)); + assertEquals("953.674GB", MemoryUtil.byteCountToDisplaySize(999_999_999_999L)); + assertEquals("953.674GB", MemoryUtil.byteCountToDisplaySize(1000_000_000_000L)); + assertEquals("1.024TB", MemoryUtil.byteCountToDisplaySize(FileUtils.ONE_TB)); + assertEquals("931.322TB", MemoryUtil.byteCountToDisplaySize(999_999_999_999_999L)); + assertEquals("931.322TB", MemoryUtil.byteCountToDisplaySize(1000_000_000_000_000L)); + assertEquals("1.024PB", MemoryUtil.byteCountToDisplaySize(FileUtils.ONE_PB)); + assertEquals("909.494PB", MemoryUtil.byteCountToDisplaySize(999_999_999_999_999_999L)); + assertEquals("909.494PB", MemoryUtil.byteCountToDisplaySize(1000_000_000_000_000_000L)); + assertEquals("1.024EB", MemoryUtil.byteCountToDisplaySize(FileUtils.ONE_EB)); + } + public void test_getUsedMemory() { assertTrue(MemoryUtil.getUsedMemory() >= 0); } From becc83e9f28e2c397d35d76aa633e4cc5b80108d Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Fri, 29 Dec 2023 15:49:28 +0900 Subject: [PATCH 05/69] fix #2792 Enhanced CPU load management and thread waiting logic for better system stability --- .../codelibs/fess/helper/SystemHelper.java | 36 +++++++++++++++++-- .../codelibs/fess/indexer/IndexUpdater.java | 7 ++-- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java index 141bd0fba4..5875823233 100644 --- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java @@ -30,14 +30,17 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Calendar; +import java.util.Collections; import java.util.Date; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Map.Entry; import java.util.Properties; +import java.util.Set; import java.util.TimeZone; import java.util.UUID; import java.util.concurrent.ExecutionException; @@ -123,6 +126,8 @@ public class SystemHelper { protected Map> updateConfigListenerMap = new HashMap<>(); + protected Set waitingThreadNames = Collections.synchronizedSet(new HashSet<>()); + @PostConstruct public void init() { if (logger.isDebugEnabled()) { @@ -589,15 +594,40 @@ public File createTempFile(final String prefix, final String suffix) { } public void calibrateCpuLoad() { - final int percent = ComponentUtil.getFessConfig().getAdaptiveLoadControlAsInteger(); + final short percent = ComponentUtil.getFessConfig().getAdaptiveLoadControlAsInteger().shortValue(); if (percent <= 0) { return; } - while (getSystemCpuPercent() > percent) { + short current = getSystemCpuPercent(); + if (current < percent) { + return; + } + final String threadName = Thread.currentThread().getName(); + try { + waitingThreadNames.add(threadName); + while (current >= percent) { + if (logger.isInfoEnabled()) { + logger.info("Cpu Load {}% is greater than {}%. {} threads are waiting.", current, percent, waitingThreadNames.size()); + } + if (logger.isDebugEnabled()) { + logger.debug("Waiting threads: {}", waitingThreadNames); + } + ThreadUtil.sleep(systemCpuCheckInterval); + current = getSystemCpuPercent(); + } + } finally { + waitingThreadNames.remove(threadName); + } + } + + public void waitForNoWaitingThreads() { + int count = waitingThreadNames.size(); + while (count > 0) { if (logger.isInfoEnabled()) { - logger.info("Cpu Load {}% is greater than {}%.", getSystemCpuPercent(), percent); + logger.info("{} threads are waiting.", count); } ThreadUtil.sleep(systemCpuCheckInterval); + count = waitingThreadNames.size(); } } diff --git a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java index e6205d072f..88c9ebe0fc 100644 --- a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java +++ b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java @@ -197,6 +197,9 @@ public void run() { final int sessionIdListSize = finishedSessionIdList.size(); intervalControlHelper.setCrawlerRunning(true); + docList.clear(); + accessResultList.clear(); + updateTime = System.currentTimeMillis() - updateTime; final long interval = updateInterval - updateTime; @@ -206,9 +209,7 @@ public void run() { } systemHelper.calibrateCpuLoad(); - - docList.clear(); - accessResultList.clear(); + systemHelper.waitForNoWaitingThreads(); intervalControlHelper.delayByRules(); From dedcfbff2518faafbcc312df45c1ceb78f1f77f0 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Mon, 1 Jan 2024 12:35:31 +0900 Subject: [PATCH 06/69] fix #2793 Integrated Jacoco for improved test coverage analysis --- pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b2c060c071..70168c5f8b 100644 --- a/pom.xml +++ b/pom.xml @@ -135,10 +135,14 @@ ${test.include.path} - ${test.command.args} + @{argLine} ${test.command.args} false + + org.jacoco + jacoco-maven-plugin + maven-failsafe-plugin From 7129edae93c736d33e7eef5007cfd7e96350dedb Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Mon, 1 Jan 2024 18:01:28 +0900 Subject: [PATCH 07/69] #2793 add test.command.args --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 70168c5f8b..87f088f178 100644 --- a/pom.xml +++ b/pom.xml @@ -67,6 +67,7 @@ integrationTests **/*Tests.java + From ab89d042f7a010904f5a6da1d1e7405022685535 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Sat, 6 Jan 2024 21:15:43 +0900 Subject: [PATCH 08/69] fix #2794 Updated exception handling to catch generic exceptions, improving stability when crawl settings are deleted --- .../java/org/codelibs/fess/helper/CrawlingConfigHelper.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java index d8194c6b46..e629e0dd41 100644 --- a/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java +++ b/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; @@ -123,7 +122,7 @@ public CrawlingConfig getCrawlingConfig(final String configId) { default -> null; }; }); - } catch (final ExecutionException e) { + } catch (final Exception e) { logger.warn("Failed to access a crawling config cache: {}", configId, e); return null; } From 491e5a02c14f9439d9e38b0b4da2e9d36c59c811 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Sun, 7 Jan 2024 22:53:22 +0900 Subject: [PATCH 09/69] fix #2795 Updated user-agent version handling in crawler to use dynamic versioning based on Fess version --- .../java/org/codelibs/fess/Constants.java | 4 + .../fess/es/config/exentity/WebConfig.java | 8 +- .../fess/mylasta/direction/FessProp.java | 4 +- .../org/codelibs/fess/util/ComponentUtil.java | 9 +- .../es/config/exentity/WebConfigTest.java | 179 ++++++++++++++++++ .../fess/mylasta/direction/FessPropTest.java | 28 +++ 6 files changed, 228 insertions(+), 4 deletions(-) create mode 100644 src/test/java/org/codelibs/fess/es/config/exentity/WebConfigTest.java diff --git a/src/main/java/org/codelibs/fess/Constants.java b/src/main/java/org/codelibs/fess/Constants.java index 4ef69a9d42..e3bce22b28 100644 --- a/src/main/java/org/codelibs/fess/Constants.java +++ b/src/main/java/org/codelibs/fess/Constants.java @@ -79,6 +79,10 @@ public class Constants extends CoreLibConstants { public static final long DEFAULT_CRAWLING_EXECUTION_INTERVAL = 5000L; + public static final String CRAWLING_USER_AGENT_PREFIX = "Mozilla/5.0 (compatible; Fess/"; + + public static final String CRAWLING_USER_AGENT_SUFFIX = "; +http://fess.codelibs.org/bot.html)"; + // fess properties public static final String USER_INFO_PROPERTY = "user.info"; 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 52bb5db23d..3dee1a21fd 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 @@ -173,7 +173,13 @@ public CrawlerClientFactory initializeClientFactory(final Supplier webAuthList = webAuthenticationService.getWebAuthenticationList(getId()); 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 3ea7271194..4ccf474291 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java @@ -694,8 +694,8 @@ default String getNotificationSearchTop() { } default String getUserAgentName() { - return getSystemProperty(Constants.CRAWLING_USER_AGENT_PROPERTY, "Mozilla/5.0 (compatible; Fess/" - + ComponentUtil.getSystemHelper().getProductVersion() + "; +http://fess.codelibs.org/bot.html)"); + return getSystemProperty(Constants.CRAWLING_USER_AGENT_PROPERTY, Constants.CRAWLING_USER_AGENT_PREFIX + + ComponentUtil.getSystemHelper().getProductVersion() + Constants.CRAWLING_USER_AGENT_SUFFIX); } default void setLtrModelName(final String value) { diff --git a/src/main/java/org/codelibs/fess/util/ComponentUtil.java b/src/main/java/org/codelibs/fess/util/ComponentUtil.java index 2afcc36e1b..b5427d5f95 100644 --- a/src/main/java/org/codelibs/fess/util/ComponentUtil.java +++ b/src/main/java/org/codelibs/fess/util/ComponentUtil.java @@ -88,6 +88,7 @@ import org.lastaflute.core.message.MessageManager; import org.lastaflute.core.security.PrimaryCipher; import org.lastaflute.di.core.SingletonLaContainer; +import org.lastaflute.di.core.exception.AutoBindingFailureException; import org.lastaflute.di.core.exception.ComponentNotFoundException; import org.lastaflute.di.core.factory.SingletonLaContainerFactory; import org.lastaflute.di.core.smart.hot.HotdeployUtil; @@ -520,6 +521,7 @@ public static RankFusionProcessor getRankFusionProcessor() { return getComponent(RANK_FUSION_PROCESSOR); } + @SuppressWarnings("unchecked") public static T getComponent(final Class clazz) { try { return SingletonLaContainer.getComponent(clazz); @@ -528,6 +530,11 @@ public static T getComponent(final Class clazz) { throw new ContainerNotAvailableException(clazz.getCanonicalName(), e); } throw new ContainerNotAvailableException(clazz.getCanonicalName()); + } catch (final ComponentNotFoundException | AutoBindingFailureException e) { + if (componentMap.containsKey(clazz.getCanonicalName())) { + return (T) componentMap.get(clazz.getCanonicalName()); + } + throw e; } } @@ -540,7 +547,7 @@ public static T getComponent(final String componentName) { throw new ContainerNotAvailableException(componentName, e); } throw new ContainerNotAvailableException(componentName); - } catch (final ComponentNotFoundException e) { + } catch (final ComponentNotFoundException | AutoBindingFailureException e) { if (componentMap.containsKey(componentName)) { return (T) componentMap.get(componentName); } diff --git a/src/test/java/org/codelibs/fess/es/config/exentity/WebConfigTest.java b/src/test/java/org/codelibs/fess/es/config/exentity/WebConfigTest.java new file mode 100644 index 0000000000..25dba44123 --- /dev/null +++ b/src/test/java/org/codelibs/fess/es/config/exentity/WebConfigTest.java @@ -0,0 +1,179 @@ +/* + * Copyright 2012-2023 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.es.config.exentity; + +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.codelibs.core.lang.StringUtil; +import org.codelibs.fess.Constants; +import org.codelibs.fess.app.service.RequestHeaderService; +import org.codelibs.fess.app.service.WebAuthenticationService; +import org.codelibs.fess.crawler.client.CrawlerClientFactory; +import org.codelibs.fess.crawler.client.http.Authentication; +import org.codelibs.fess.helper.SystemHelper; +import org.codelibs.fess.mylasta.direction.FessConfig; +import org.codelibs.fess.mylasta.direction.FessProp; +import org.codelibs.fess.unit.UnitFessTestCase; +import org.codelibs.fess.util.ComponentUtil; +import org.opensearch.common.SetOnce; + +public class WebConfigTest extends UnitFessTestCase { + + @Override + protected boolean isUseOneTimeContainer() { + return true; + } + + public void test_initializeClientFactory() { + final Map systemPropMap = new HashMap<>(); + FessProp.propMap.clear(); + FessConfig fessConfig = new FessConfig.SimpleImpl() { + @Override + public String getSystemProperty(final String key, final String defaultValue) { + return systemPropMap.getOrDefault(key, defaultValue); + } + + @Override + public boolean isCrawlerIgnoreRobotsTxt() { + return false; + } + + @Override + public String getHttpProxyHost() { + return StringUtil.EMPTY; + } + + @Override + public String getHttpProxyPort() { + return StringUtil.EMPTY; + } + }; + ComponentUtil.setFessConfig(fessConfig); + SystemHelper systemHelper = new SystemHelper() { + @Override + public String getProductVersion() { + return "98.76"; + } + }; + ComponentUtil.register(systemHelper, "systemHelper"); + WebAuthenticationService webAuthenticationService = new WebAuthenticationService() { + @Override + public List getWebAuthenticationList(final String webConfigId) { + return Collections.emptyList(); + } + }; + ComponentUtil.register(webAuthenticationService, WebAuthenticationService.class.getCanonicalName()); + RequestHeaderService requestHeaderService = new RequestHeaderService() { + @Override + public List getRequestHeaderList(final String webConfigId) { + return Collections.emptyList(); + } + }; + ComponentUtil.register(requestHeaderService, RequestHeaderService.class.getCanonicalName()); + + final SetOnce> initParamMapSet = new SetOnce<>(); + WebConfig webConfig = new WebConfig(); + webConfig.setUserAgent(Constants.CRAWLING_USER_AGENT_PREFIX + "1.0" + Constants.CRAWLING_USER_AGENT_SUFFIX); + CrawlerClientFactory crawlerClientFactory = webConfig.initializeClientFactory(() -> new CrawlerClientFactory() { + public void setInitParameterMap(final Map params) { + initParamMapSet.set(params); + } + }); + assertNotNull(crawlerClientFactory); + Map initParamMap = initParamMapSet.get(); + assertNotNull(initParamMap); + assertEquals(0, ((org.codelibs.fess.crawler.client.http.RequestHeader[]) initParamMap.get("requestHeaders")).length); + assertEquals("Mozilla/5.0 (compatible; Fess/98.76; +http://fess.codelibs.org/bot.html)", initParamMap.get("userAgent")); + assertEquals(0, ((Authentication[]) initParamMap.get("basicAuthentications")).length); + assertTrue(Boolean.valueOf(initParamMap.get("robotsTxtEnabled").toString()).booleanValue()); + } + + public void test_initializeClientFactoryWithConfigParameter() { + final Map systemPropMap = new HashMap<>(); + FessProp.propMap.clear(); + FessConfig fessConfig = new FessConfig.SimpleImpl() { + @Override + public String getSystemProperty(final String key, final String defaultValue) { + return systemPropMap.getOrDefault(key, defaultValue); + } + + @Override + public boolean isCrawlerIgnoreRobotsTxt() { + return false; + } + + @Override + public String getHttpProxyHost() { + return StringUtil.EMPTY; + } + + @Override + public String getHttpProxyPort() { + return StringUtil.EMPTY; + } + + @Override + public String getAppEncryptPropertyPattern() { + return ".*password|.*key|.*token|.*secret"; + } + }; + ComponentUtil.setFessConfig(fessConfig); + SystemHelper systemHelper = new SystemHelper() { + @Override + public String getProductVersion() { + return "98.76"; + } + }; + ComponentUtil.register(systemHelper, "systemHelper"); + WebAuthenticationService webAuthenticationService = new WebAuthenticationService() { + @Override + public List getWebAuthenticationList(final String webConfigId) { + return Collections.emptyList(); + } + }; + ComponentUtil.register(webAuthenticationService, WebAuthenticationService.class.getCanonicalName()); + RequestHeaderService requestHeaderService = new RequestHeaderService() { + @Override + public List getRequestHeaderList(final String webConfigId) { + return Collections.emptyList(); + } + }; + ComponentUtil.register(requestHeaderService, RequestHeaderService.class.getCanonicalName()); + + final SetOnce> initParamMapSet = new SetOnce<>(); + WebConfig webConfig = new WebConfig(); + final String userAgent = "TestAgent"; + webConfig.setUserAgent(userAgent); + webConfig.setConfigParameter(""" + client.robotsTxtEnabled=false + """); + CrawlerClientFactory crawlerClientFactory = webConfig.initializeClientFactory(() -> new CrawlerClientFactory() { + public void setInitParameterMap(final Map params) { + initParamMapSet.set(params); + } + }); + assertNotNull(crawlerClientFactory); + Map initParamMap = initParamMapSet.get(); + assertNotNull(initParamMap); + assertEquals(0, ((org.codelibs.fess.crawler.client.http.RequestHeader[]) initParamMap.get("requestHeaders")).length); + assertEquals(userAgent, initParamMap.get("userAgent")); + assertEquals(0, ((Authentication[]) initParamMap.get("basicAuthentications")).length); + assertFalse(Boolean.valueOf(initParamMap.get("robotsTxtEnabled").toString()).booleanValue()); + } +} diff --git a/src/test/java/org/codelibs/fess/mylasta/direction/FessPropTest.java b/src/test/java/org/codelibs/fess/mylasta/direction/FessPropTest.java index 9f62560f70..0542357763 100644 --- a/src/test/java/org/codelibs/fess/mylasta/direction/FessPropTest.java +++ b/src/test/java/org/codelibs/fess/mylasta/direction/FessPropTest.java @@ -21,10 +21,14 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Locale; +import java.util.Map; import org.codelibs.core.io.FileUtil; import org.codelibs.core.misc.DynamicProperties; +import org.codelibs.fess.Constants; +import org.codelibs.fess.helper.SystemHelper; import org.codelibs.fess.unit.UnitFessTestCase; +import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.util.PrunedTag; import org.codelibs.nekohtml.parsers.DOMParser; import org.lastaflute.di.core.factory.SingletonLaContainerFactory; @@ -262,6 +266,30 @@ public String getUserCodePattern() { assertFalse(fessConfig.isValidUserCode("123456789?")); } + public void test_getUserAgentName() throws IOException { + final Map systemPropMap = new HashMap<>(); + FessProp.propMap.clear(); + FessConfig fessConfig = new FessConfig.SimpleImpl() { + @Override + public String getSystemProperty(final String key, final String defaultValue) { + return systemPropMap.getOrDefault(key, defaultValue); + } + }; + ComponentUtil.setFessConfig(fessConfig); + SystemHelper systemHelper = new SystemHelper() { + @Override + public String getProductVersion() { + return "98.76"; + } + }; + ComponentUtil.register(systemHelper, "systemHelper"); + + assertEquals("Mozilla/5.0 (compatible; Fess/98.76; +http://fess.codelibs.org/bot.html)", fessConfig.getUserAgentName()); + + systemPropMap.put(Constants.CRAWLING_USER_AGENT_PROPERTY, "TestAgent"); + assertEquals("TestAgent", fessConfig.getUserAgentName()); + } + private void assertArrays(final String[] expected, final String[] actual) { Arrays.sort(expected); Arrays.sort(actual); From ed73caf3598327f6b649e8bed91a12f6eb402022 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Tue, 9 Jan 2024 22:20:40 +0900 Subject: [PATCH 10/69] fix #2796 Added JUnit tests for SystemHelper methods, ensuring enhanced reliability and coverage --- .../codelibs/fess/helper/SystemHelper.java | 7 +- .../fess/helper/SystemHelperTest.java | 169 +++++++++++++++++- 2 files changed, 171 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java index 5875823233..98b3b26eb1 100644 --- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java @@ -170,7 +170,7 @@ public List> load(final String key) throws Exception { ComponentUtil.doInitProcesses(Runnable::run); - parseProjectProperties(); + parseProjectProperties(ResourceUtil.getProjectPropertiesFile()); updateConfigListenerMap.put("Label", () -> Integer.toString(ComponentUtil.getLabelTypeHelper().load())); updateConfigListenerMap.put("PathMapping", () -> Integer.toString(ComponentUtil.getPathMappingHelper().load())); @@ -179,8 +179,7 @@ public List> load(final String key) throws Exception { updateConfigListenerMap.put("KeyMatch", () -> Integer.toString(ComponentUtil.getKeyMatchHelper().load())); } - protected void parseProjectProperties() { - final Path propPath = ResourceUtil.getProjectPropertiesFile(); + protected void parseProjectProperties(final Path propPath) { try (final InputStream in = Files.newInputStream(propPath)) { final Properties prop = new Properties(); prop.load(in); @@ -358,7 +357,7 @@ public boolean isForceStop() { } public void setForceStop(final boolean b) { - forceStop.set(true); + forceStop.set(b); } public String generateDocId(final Map map) { diff --git a/src/test/java/org/codelibs/fess/helper/SystemHelperTest.java b/src/test/java/org/codelibs/fess/helper/SystemHelperTest.java index cc1e926a30..4bea802ec9 100644 --- a/src/test/java/org/codelibs/fess/helper/SystemHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/SystemHelperTest.java @@ -15,12 +15,23 @@ */ package org.codelibs.fess.helper; +import java.io.File; +import java.nio.file.Path; +import java.time.ZoneId; +import java.util.Collections; import java.util.HashMap; +import java.util.List; +import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import org.codelibs.core.io.FileUtil; +import org.codelibs.core.misc.Pair; import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.unit.UnitFessTestCase; import org.codelibs.fess.util.ComponentUtil; +import org.lastaflute.web.response.HtmlResponse; public class SystemHelperTest extends UnitFessTestCase { @@ -31,9 +42,13 @@ public class SystemHelperTest extends UnitFessTestCase { @Override public void setUp() throws Exception { super.setUp(); + final File propFile = File.createTempFile("project", ".properties"); + propFile.deleteOnExit(); + FileUtil.writeBytes(propFile.getAbsolutePath(), "fess.version=98.76.5".getBytes()); systemHelper = new SystemHelper() { @Override - protected void parseProjectProperties() { + protected void parseProjectProperties(final Path propPath) { + super.parseProjectProperties(propFile.toPath()); } @Override @@ -47,6 +62,158 @@ protected Map getEnvMap() { }; envMap.clear(); systemHelper.init(); + ComponentUtil.register(systemHelper, "systemHelper"); + } + + public void test_getUsername() { + assertEquals("guest", systemHelper.getUsername()); + } + + public void test_getCurrentTimeAsLocalDateTime() { + final long current = + 1000 * systemHelper.getCurrentTimeAsLocalDateTime().atZone(ZoneId.systemDefault()).toInstant().getEpochSecond(); + final long now = System.currentTimeMillis(); + assertTrue(now + ">=" + current + " : " + (now - current), now >= current); + assertTrue((now - 1000) + "<" + current + " : " + (current - now + 1000), now - 1000 < current); + } + + public void test_getLogFilePath() { + final File logFile = new File(systemHelper.getLogFilePath()); + assertEquals("logs", logFile.getName()); + assertEquals("target", logFile.getParentFile().getName()); + try { + System.setProperty("fess.log.path", "logpath"); + assertEquals("logpath", systemHelper.getLogFilePath()); + } finally { + System.clearProperty("fess.log.path"); + } + } + + public void test_getForumLink() { + assertEquals("https://discuss.codelibs.org/c/FessEN/", systemHelper.getForumLink()); + } + + public void test_getHelpLink() { + assertEquals("https://fess.codelibs.org/98.76/admin/xxx-guide.html", systemHelper.getHelpLink("xxx")); + } + + public void test_getDesignJspFileName() { + assertNull(systemHelper.getDesignJspFileName("xxx")); + systemHelper.addDesignJspFileName("xxx", "yyy"); + assertEquals("yyy", systemHelper.getDesignJspFileName("xxx")); + final Pair[] designJspFileNames = systemHelper.getDesignJspFileNames(); + assertEquals(1, designJspFileNames.length); + assertEquals("xxx", designJspFileNames[0].getFirst()); + assertEquals("yyy", designJspFileNames[0].getSecond()); + } + + public void test_setForceStop() { + assertFalse(systemHelper.isForceStop()); + systemHelper.setForceStop(true); + assertTrue(systemHelper.isForceStop()); + systemHelper.setForceStop(false); + assertFalse(systemHelper.isForceStop()); + } + + public void test_generateDocId() { + final String docId = systemHelper.generateDocId(Collections.emptyMap()); + assertNotNull(docId); + assertEquals(32, docId.length()); + } + + public void test_abbreviateLongText() { + assertEquals("", systemHelper.abbreviateLongText("")); + assertEquals(4000, systemHelper.abbreviateLongText(Stream.generate(() -> "a").limit(4000).collect(Collectors.joining())).length()); + assertEquals(4000, systemHelper.abbreviateLongText(Stream.generate(() -> "a").limit(4001).collect(Collectors.joining())).length()); + } + + public void test_getLanguageItems() { + List> enItems = systemHelper.getLanguageItems(Locale.ENGLISH); + assertEquals(55, enItems.size()); + List> jaItems = systemHelper.getLanguageItems(Locale.JAPANESE); + assertEquals(55, jaItems.size()); + } + + public void test_getHostnamet() { + assertNotNull(systemHelper.getHostname()); + try { + envMap.put("COMPUTERNAME", "xxx"); + assertEquals("xxx", systemHelper.getHostname()); + } finally { + envMap.remove("COMPUTERNAME"); + } + try { + envMap.put("HOSTNAME", "yyy"); + assertEquals("yyy", systemHelper.getHostname()); + } finally { + envMap.remove("HOSTNAME"); + } + } + + public void test_isEoled() { + assertEquals(systemHelper.getCurrentTimeAsLong() > systemHelper.eolTime, systemHelper.isEoled()); + } + + public void test_updateConfiguration() { + assertNotNull(systemHelper.updateConfiguration()); + systemHelper.addUpdateConfigListener("XXX", () -> "OK"); + assertTrue(systemHelper.updateConfiguration().contains("XXX: OK")); + } + + public void test_isChangedClusterState() { + systemHelper.isChangedClusterState(0); + assertFalse(systemHelper.isChangedClusterState(0)); + assertTrue(systemHelper.isChangedClusterState(1)); + assertTrue(systemHelper.isChangedClusterState(2)); + assertFalse(systemHelper.isChangedClusterState(2)); + } + + public void test_getRedirectResponseToLogin() { + final HtmlResponse response = HtmlResponse.fromForwardPath("/"); + assertEquals(response, systemHelper.getRedirectResponseToLogin(response)); + } + + public void test_getRedirectResponseToRoot() { + final HtmlResponse response = HtmlResponse.fromForwardPath("/"); + assertEquals(response, systemHelper.getRedirectResponseToRoot(response)); + } + + public void test_getLogLevel() { + final String logLevel = systemHelper.getLogLevel(); + try { + systemHelper.setLogLevel("DEBUG"); + assertEquals("DEBUG", systemHelper.getLogLevel()); + systemHelper.setLogLevel("INFO"); + assertEquals("INFO", systemHelper.getLogLevel()); + systemHelper.setLogLevel("WARN"); + assertEquals("WARN", systemHelper.getLogLevel()); + systemHelper.setLogLevel("ERROR"); + assertEquals("ERROR", systemHelper.getLogLevel()); + } finally { + systemHelper.setLogLevel(logLevel); + } + } + + public void test_createTempFile() { + assertNotNull(systemHelper.createTempFile("test", ".txt")); + } + + public void test_calibrateCpuLoad() { + systemHelper.setSystemCpuCheckInterval(0L); + systemHelper.calibrateCpuLoad(); + assertEquals(0, systemHelper.waitingThreadNames.size()); + systemHelper.waitForNoWaitingThreads(); + } + + public void test_getVersion() { + assertEquals("98.76.5", systemHelper.getVersion()); + assertEquals(98, systemHelper.getMajorVersion()); + assertEquals(76, systemHelper.getMinorVersion()); + assertEquals("98.76", systemHelper.getProductVersion()); + } + + public void test_getEnvMap() { + assertNotNull(new SystemHelper().getEnvMap()); } public void test_encodeUrlFilter() { From 296368a9fc66b28289c0809e31d67237e4d1450d Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 11 Jan 2024 11:39:34 +0900 Subject: [PATCH 11/69] fix #2797 Enhanced CrawlingConfigHelper with improved parameter naming and added extensive JUnit tests for robust testing --- .../fess/helper/CrawlingConfigHelper.java | 12 +- .../fess/helper/CrawlingConfigHelperTest.java | 434 ++++++++++++++++++ 2 files changed, 442 insertions(+), 4 deletions(-) create mode 100644 src/test/java/org/codelibs/fess/helper/CrawlingConfigHelperTest.java diff --git a/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java index e629e0dd41..7004b8a3f5 100644 --- a/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java +++ b/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java @@ -151,12 +151,12 @@ public synchronized String store(final String sessionId, final CrawlingConfig cr return sessionCountId; } - public void remove(final String sessionId) { - crawlingConfigMap.remove(sessionId); + public void remove(final String sessionCountId) { + crawlingConfigMap.remove(sessionCountId); } - public CrawlingConfig get(final String sessionId) { - return crawlingConfigMap.get(sessionId); + public CrawlingConfig get(final String sessionCountId) { + return crawlingConfigMap.get(sessionCountId); } public List getAllWebConfigList() { @@ -277,6 +277,10 @@ public List getExcludedUrlList(final String configId) { } public OptionalEntity getDefaultConfig(final ConfigType configType) { + if (configType == null) { + return OptionalEntity.empty(); + } + final String name = ComponentUtil.getFessConfig().getFormAdminDefaultTemplateName(); return switch (configType) { diff --git a/src/test/java/org/codelibs/fess/helper/CrawlingConfigHelperTest.java b/src/test/java/org/codelibs/fess/helper/CrawlingConfigHelperTest.java new file mode 100644 index 0000000000..d58647ae96 --- /dev/null +++ b/src/test/java/org/codelibs/fess/helper/CrawlingConfigHelperTest.java @@ -0,0 +1,434 @@ +/* + * Copyright 2012-2023 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.helper; + +import java.io.File; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; + +import org.codelibs.core.io.FileUtil; +import org.codelibs.core.misc.DynamicProperties; +import org.codelibs.fess.Constants; +import org.codelibs.fess.app.service.DataConfigService; +import org.codelibs.fess.app.service.FileConfigService; +import org.codelibs.fess.app.service.WebConfigService; +import org.codelibs.fess.es.config.cbean.DataConfigCB; +import org.codelibs.fess.es.config.cbean.FailureUrlCB; +import org.codelibs.fess.es.config.cbean.FileConfigCB; +import org.codelibs.fess.es.config.cbean.WebConfigCB; +import org.codelibs.fess.es.config.exbhv.DataConfigBhv; +import org.codelibs.fess.es.config.exbhv.FailureUrlBhv; +import org.codelibs.fess.es.config.exbhv.FileConfigBhv; +import org.codelibs.fess.es.config.exbhv.WebConfigBhv; +import org.codelibs.fess.es.config.exentity.CrawlingConfig; +import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigType; +import org.codelibs.fess.es.config.exentity.DataConfig; +import org.codelibs.fess.es.config.exentity.FailureUrl; +import org.codelibs.fess.es.config.exentity.FileConfig; +import org.codelibs.fess.es.config.exentity.WebConfig; +import org.codelibs.fess.unit.UnitFessTestCase; +import org.codelibs.fess.util.ComponentUtil; +import org.dbflute.bhv.readable.CBCall; +import org.dbflute.cbean.result.ListResultBean; +import org.dbflute.optional.OptionalEntity; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.search.sort.FieldSortBuilder; + +public class CrawlingConfigHelperTest extends UnitFessTestCase { + private CrawlingConfigHelper crawlingConfigHelper; + + @Override + public void setUp() throws Exception { + super.setUp(); + final File propFile = File.createTempFile("system", ".properties"); + propFile.deleteOnExit(); + FileUtil.writeBytes(propFile.getAbsolutePath(), "".getBytes()); + ComponentUtil.register(new DynamicProperties(propFile), "systemProperties"); + crawlingConfigHelper = new CrawlingConfigHelper(); + crawlingConfigHelper.init(); + ComponentUtil.register(crawlingConfigHelper, "crawlingConfigHelper"); + ComponentUtil.register(new WebConfigService() { + @Override + public OptionalEntity getWebConfig(final String id) { + final WebConfig webConfig = new WebConfig(); + webConfig.setId(id); + if (id.endsWith("P")) { + webConfig.setConfigParameter("config.pipeline=wp"); + } + return OptionalEntity.of(webConfig); + } + + @Override + public OptionalEntity getWebConfigByName(String name) { + final WebConfig webConfig = new WebConfig(); + webConfig.setId("01T"); + webConfig.setName("__TEMPLATE__"); + return OptionalEntity.of(webConfig); + } + }, WebConfigService.class.getCanonicalName()); + ComponentUtil.register(new FileConfigService() { + @Override + public OptionalEntity getFileConfig(final String id) { + final FileConfig fileConfig = new FileConfig(); + fileConfig.setId(id); + if (id.endsWith("P")) { + fileConfig.setConfigParameter("config.pipeline=fp"); + } + return OptionalEntity.of(fileConfig); + } + + @Override + public OptionalEntity getFileConfigByName(String name) { + final FileConfig fileConfig = new FileConfig(); + fileConfig.setId("11T"); + fileConfig.setName("__TEMPLATE__"); + return OptionalEntity.of(fileConfig); + } + }, FileConfigService.class.getCanonicalName()); + ComponentUtil.register(new DataConfigService() { + @Override + public OptionalEntity getDataConfig(final String id) { + final DataConfig dataConfig = new DataConfig(); + dataConfig.setId(id); + if (id.endsWith("P")) { + dataConfig.setHandlerParameter("config.pipeline=dp"); + } + return OptionalEntity.of(dataConfig); + } + + @Override + public OptionalEntity getDataConfigByName(String name) { + final DataConfig dataConfig = new DataConfig(); + dataConfig.setId("21T"); + dataConfig.setName("__TEMPLATE__"); + return OptionalEntity.of(dataConfig); + } + }, DataConfigService.class.getCanonicalName()); + } + + public void test_getConfigType() { + assertNull(crawlingConfigHelper.getConfigType(null)); + assertNull(crawlingConfigHelper.getConfigType("")); + assertNull(crawlingConfigHelper.getConfigType("XXX")); + assertNull(crawlingConfigHelper.getConfigType("W")); + assertNull(crawlingConfigHelper.getConfigType("F")); + assertNull(crawlingConfigHelper.getConfigType("D")); + assertEquals(ConfigType.WEB, crawlingConfigHelper.getConfigType("WX")); + assertEquals(ConfigType.FILE, crawlingConfigHelper.getConfigType("FX")); + assertEquals(ConfigType.DATA, crawlingConfigHelper.getConfigType("DX")); + } + + public void test_getCrawlingConfig() { + crawlingConfigHelper.refresh(); + assertNull(crawlingConfigHelper.getCrawlingConfig(null)); + assertNull(crawlingConfigHelper.getCrawlingConfig("")); + assertNull(crawlingConfigHelper.getCrawlingConfig("XXX")); + final CrawlingConfig webConfig = crawlingConfigHelper.getCrawlingConfig("W01"); + assertEquals("01", webConfig.getId()); + assertTrue(webConfig instanceof WebConfig); + final CrawlingConfig fileConfig = crawlingConfigHelper.getCrawlingConfig("F11"); + assertEquals("11", fileConfig.getId()); + assertTrue(fileConfig instanceof FileConfig); + final CrawlingConfig dataConfig = crawlingConfigHelper.getCrawlingConfig("D21"); + assertEquals("21", dataConfig.getId()); + assertTrue(dataConfig instanceof DataConfig); + } + + public void test_getPipeline() { + crawlingConfigHelper.refresh(); + assertTrue(crawlingConfigHelper.getPipeline(null).isEmpty()); + assertTrue(crawlingConfigHelper.getPipeline("").isEmpty()); + assertTrue(crawlingConfigHelper.getPipeline("XXX").isEmpty()); + assertTrue(crawlingConfigHelper.getPipeline("W1").isEmpty()); + assertTrue(crawlingConfigHelper.getPipeline("F1").isEmpty()); + assertTrue(crawlingConfigHelper.getPipeline("D1").isEmpty()); + assertEquals("wp", crawlingConfigHelper.getPipeline("W1P").get()); + assertEquals("fp", crawlingConfigHelper.getPipeline("F1P").get()); + assertEquals("dp", crawlingConfigHelper.getPipeline("D1P").get()); + } + + public void test_sessionCountId() { + final String sessionId = "12345"; + final String sessionCountId = sessionId + "-1"; + assertNull(crawlingConfigHelper.get(sessionCountId)); + crawlingConfigHelper.store(sessionId, crawlingConfigHelper.getCrawlingConfig("W1")); + assertEquals("1", crawlingConfigHelper.get(sessionCountId).getId()); + crawlingConfigHelper.remove(sessionCountId); + assertNull(crawlingConfigHelper.get(sessionCountId)); + } + + public void test_getAllWebConfigList() { + final WebConfigCB cb = new WebConfigCB(); + ComponentUtil.register(new WebConfigBhv() { + @Override + public ListResultBean selectList(final CBCall cbLambda) { + cbLambda.callback(cb); + final ListResultBean list = new ListResultBean<>(); + list.add((WebConfig) crawlingConfigHelper.getCrawlingConfig("W1")); + list.add((WebConfig) crawlingConfigHelper.getCrawlingConfig("W2")); + list.add((WebConfig) crawlingConfigHelper.getCrawlingConfig("W3")); + return list; + } + }, WebConfigBhv.class.getCanonicalName()); + final List configList = crawlingConfigHelper.getAllWebConfigList(); + assertEquals(3, configList.size()); + final List queryBuilderList = cb.query().getQueryBuilderList(); + assertEquals(2, queryBuilderList.size()); + assertEquals("TermQueryBuilder", queryBuilderList.get(0).getClass().getSimpleName()); + assertEquals("BoolQueryBuilder", queryBuilderList.get(1).getClass().getSimpleName()); + final List fieldSortBuilderList = cb.query().getFieldSortBuilderList(); + assertEquals(2, fieldSortBuilderList.size()); + assertEquals("sortOrder", fieldSortBuilderList.get(0).getFieldName()); + assertEquals("name", fieldSortBuilderList.get(1).getFieldName()); + } + + public void test_getWebConfigListByIds_null() { + final WebConfigCB cb = new WebConfigCB(); + ComponentUtil.register(new WebConfigBhv() { + @Override + public ListResultBean selectList(final CBCall cbLambda) { + cbLambda.callback(cb); + final ListResultBean list = new ListResultBean<>(); + list.add((WebConfig) crawlingConfigHelper.getCrawlingConfig("W1")); + list.add((WebConfig) crawlingConfigHelper.getCrawlingConfig("W2")); + list.add((WebConfig) crawlingConfigHelper.getCrawlingConfig("W3")); + return list; + } + }, WebConfigBhv.class.getCanonicalName()); + final List configList = crawlingConfigHelper.getWebConfigListByIds(null); + assertEquals(3, configList.size()); + final List queryBuilderList = cb.query().getQueryBuilderList(); + assertEquals(2, queryBuilderList.size()); + assertEquals("TermQueryBuilder", queryBuilderList.get(0).getClass().getSimpleName()); + assertEquals("BoolQueryBuilder", queryBuilderList.get(1).getClass().getSimpleName()); + final List fieldSortBuilderList = cb.query().getFieldSortBuilderList(); + assertEquals(2, fieldSortBuilderList.size()); + assertEquals("sortOrder", fieldSortBuilderList.get(0).getFieldName()); + assertEquals("name", fieldSortBuilderList.get(1).getFieldName()); + } + + public void test_getWebConfigListByIds() { + final WebConfigCB cb = new WebConfigCB(); + ComponentUtil.register(new WebConfigBhv() { + @Override + public ListResultBean selectList(final CBCall cbLambda) { + cbLambda.callback(cb); + final ListResultBean list = new ListResultBean<>(); + list.add((WebConfig) crawlingConfigHelper.getCrawlingConfig("W1")); + list.add((WebConfig) crawlingConfigHelper.getCrawlingConfig("W2")); + list.add((WebConfig) crawlingConfigHelper.getCrawlingConfig("W3")); + return list; + } + }, WebConfigBhv.class.getCanonicalName()); + final List configList = crawlingConfigHelper.getWebConfigListByIds(List.of("W1", "W2", "W3")); + assertEquals(3, configList.size()); + final List queryBuilderList = cb.query().getQueryBuilderList(); + assertEquals(2, queryBuilderList.size()); + assertEquals("IdsQueryBuilder", queryBuilderList.get(0).getClass().getSimpleName()); + assertEquals("BoolQueryBuilder", queryBuilderList.get(1).getClass().getSimpleName()); + final List fieldSortBuilderList = cb.query().getFieldSortBuilderList(); + assertEquals(2, fieldSortBuilderList.size()); + assertEquals("sortOrder", fieldSortBuilderList.get(0).getFieldName()); + assertEquals("name", fieldSortBuilderList.get(1).getFieldName()); + } + + public void test_getAllFileConfigList() { + final FileConfigCB cb = new FileConfigCB(); + ComponentUtil.register(new FileConfigBhv() { + @Override + public ListResultBean selectList(final CBCall cbLambda) { + cbLambda.callback(cb); + final ListResultBean list = new ListResultBean<>(); + list.add((FileConfig) crawlingConfigHelper.getCrawlingConfig("F1")); + list.add((FileConfig) crawlingConfigHelper.getCrawlingConfig("F2")); + list.add((FileConfig) crawlingConfigHelper.getCrawlingConfig("F3")); + return list; + } + }, FileConfigBhv.class.getCanonicalName()); + final List configList = crawlingConfigHelper.getAllFileConfigList(); + assertEquals(3, configList.size()); + final List queryBuilderList = cb.query().getQueryBuilderList(); + assertEquals(2, queryBuilderList.size()); + assertEquals("TermQueryBuilder", queryBuilderList.get(0).getClass().getSimpleName()); + assertEquals("BoolQueryBuilder", queryBuilderList.get(1).getClass().getSimpleName()); + final List fieldSortBuilderList = cb.query().getFieldSortBuilderList(); + assertEquals(2, fieldSortBuilderList.size()); + assertEquals("sortOrder", fieldSortBuilderList.get(0).getFieldName()); + assertEquals("name", fieldSortBuilderList.get(1).getFieldName()); + } + + public void test_getFileConfigListByIds_null() { + final FileConfigCB cb = new FileConfigCB(); + ComponentUtil.register(new FileConfigBhv() { + @Override + public ListResultBean selectList(final CBCall cbLambda) { + cbLambda.callback(cb); + final ListResultBean list = new ListResultBean<>(); + list.add((FileConfig) crawlingConfigHelper.getCrawlingConfig("F1")); + list.add((FileConfig) crawlingConfigHelper.getCrawlingConfig("F2")); + list.add((FileConfig) crawlingConfigHelper.getCrawlingConfig("F3")); + return list; + } + }, FileConfigBhv.class.getCanonicalName()); + final List configList = crawlingConfigHelper.getFileConfigListByIds(null); + assertEquals(3, configList.size()); + final List queryBuilderList = cb.query().getQueryBuilderList(); + assertEquals(2, queryBuilderList.size()); + assertEquals("TermQueryBuilder", queryBuilderList.get(0).getClass().getSimpleName()); + assertEquals("BoolQueryBuilder", queryBuilderList.get(1).getClass().getSimpleName()); + final List fieldSortBuilderList = cb.query().getFieldSortBuilderList(); + assertEquals(2, fieldSortBuilderList.size()); + assertEquals("sortOrder", fieldSortBuilderList.get(0).getFieldName()); + assertEquals("name", fieldSortBuilderList.get(1).getFieldName()); + } + + public void test_getFileConfigListByIds() { + final FileConfigCB cb = new FileConfigCB(); + ComponentUtil.register(new FileConfigBhv() { + @Override + public ListResultBean selectList(final CBCall cbLambda) { + cbLambda.callback(cb); + final ListResultBean list = new ListResultBean<>(); + list.add((FileConfig) crawlingConfigHelper.getCrawlingConfig("F1")); + list.add((FileConfig) crawlingConfigHelper.getCrawlingConfig("F2")); + list.add((FileConfig) crawlingConfigHelper.getCrawlingConfig("F3")); + return list; + } + }, FileConfigBhv.class.getCanonicalName()); + final List configList = crawlingConfigHelper.getFileConfigListByIds(List.of("F1", "F2", "F3")); + assertEquals(3, configList.size()); + final List queryBuilderList = cb.query().getQueryBuilderList(); + assertEquals(2, queryBuilderList.size()); + assertEquals("IdsQueryBuilder", queryBuilderList.get(0).getClass().getSimpleName()); + assertEquals("BoolQueryBuilder", queryBuilderList.get(1).getClass().getSimpleName()); + final List fieldSortBuilderList = cb.query().getFieldSortBuilderList(); + assertEquals(2, fieldSortBuilderList.size()); + assertEquals("sortOrder", fieldSortBuilderList.get(0).getFieldName()); + assertEquals("name", fieldSortBuilderList.get(1).getFieldName()); + } + + public void test_getAllDataConfigList() { + final DataConfigCB cb = new DataConfigCB(); + ComponentUtil.register(new DataConfigBhv() { + @Override + public ListResultBean selectList(final CBCall cbLambda) { + cbLambda.callback(cb); + final ListResultBean list = new ListResultBean<>(); + list.add((DataConfig) crawlingConfigHelper.getCrawlingConfig("D1")); + list.add((DataConfig) crawlingConfigHelper.getCrawlingConfig("D2")); + list.add((DataConfig) crawlingConfigHelper.getCrawlingConfig("D3")); + return list; + } + }, DataConfigBhv.class.getCanonicalName()); + final List configList = crawlingConfigHelper.getAllDataConfigList(); + assertEquals(3, configList.size()); + final List queryBuilderList = cb.query().getQueryBuilderList(); + assertEquals(2, queryBuilderList.size()); + assertEquals("TermQueryBuilder", queryBuilderList.get(0).getClass().getSimpleName()); + assertEquals("BoolQueryBuilder", queryBuilderList.get(1).getClass().getSimpleName()); + final List fieldSortBuilderList = cb.query().getFieldSortBuilderList(); + assertEquals(2, fieldSortBuilderList.size()); + assertEquals("sortOrder", fieldSortBuilderList.get(0).getFieldName()); + assertEquals("name", fieldSortBuilderList.get(1).getFieldName()); + } + + public void test_getDataConfigListByIds_null() { + final DataConfigCB cb = new DataConfigCB(); + ComponentUtil.register(new DataConfigBhv() { + @Override + public ListResultBean selectList(final CBCall cbLambda) { + cbLambda.callback(cb); + final ListResultBean list = new ListResultBean<>(); + list.add((DataConfig) crawlingConfigHelper.getCrawlingConfig("D1")); + list.add((DataConfig) crawlingConfigHelper.getCrawlingConfig("D2")); + list.add((DataConfig) crawlingConfigHelper.getCrawlingConfig("D3")); + return list; + } + }, DataConfigBhv.class.getCanonicalName()); + final List configList = crawlingConfigHelper.getDataConfigListByIds(null); + assertEquals(3, configList.size()); + final List queryBuilderList = cb.query().getQueryBuilderList(); + assertEquals(2, queryBuilderList.size()); + assertEquals("TermQueryBuilder", queryBuilderList.get(0).getClass().getSimpleName()); + assertEquals("BoolQueryBuilder", queryBuilderList.get(1).getClass().getSimpleName()); + final List fieldSortBuilderList = cb.query().getFieldSortBuilderList(); + assertEquals(2, fieldSortBuilderList.size()); + assertEquals("sortOrder", fieldSortBuilderList.get(0).getFieldName()); + assertEquals("name", fieldSortBuilderList.get(1).getFieldName()); + } + + public void test_getDataConfigListByIds() { + final DataConfigCB cb = new DataConfigCB(); + ComponentUtil.register(new DataConfigBhv() { + @Override + public ListResultBean selectList(final CBCall cbLambda) { + cbLambda.callback(cb); + final ListResultBean list = new ListResultBean<>(); + list.add((DataConfig) crawlingConfigHelper.getCrawlingConfig("D1")); + list.add((DataConfig) crawlingConfigHelper.getCrawlingConfig("D2")); + list.add((DataConfig) crawlingConfigHelper.getCrawlingConfig("D3")); + return list; + } + }, DataConfigBhv.class.getCanonicalName()); + final List configList = crawlingConfigHelper.getDataConfigListByIds(List.of("D1", "D2", "D3")); + assertEquals(3, configList.size()); + final List queryBuilderList = cb.query().getQueryBuilderList(); + assertEquals(2, queryBuilderList.size()); + assertEquals("IdsQueryBuilder", queryBuilderList.get(0).getClass().getSimpleName()); + assertEquals("BoolQueryBuilder", queryBuilderList.get(1).getClass().getSimpleName()); + final List fieldSortBuilderList = cb.query().getFieldSortBuilderList(); + assertEquals(2, fieldSortBuilderList.size()); + assertEquals("sortOrder", fieldSortBuilderList.get(0).getFieldName()); + assertEquals("name", fieldSortBuilderList.get(1).getFieldName()); + } + + public void test_getExcludedUrlList() { + final AtomicInteger errorCount = new AtomicInteger(0); + final DynamicProperties systemProperties = ComponentUtil.getSystemProperties(); + final FailureUrlCB cb = new FailureUrlCB(); + ComponentUtil.register(new FailureUrlBhv() { + @Override + public ListResultBean selectList(final CBCall cbLambda) { + cbLambda.callback(cb); + final ListResultBean list = new ListResultBean<>(); + for (int i = 0; i < errorCount.get(); i++) { + FailureUrl failureUrl = new FailureUrl(); + failureUrl.setId("E" + i); + failureUrl.setUrl("http://test.com/" + i + ".html"); + failureUrl.setErrorCount(i); + failureUrl.setErrorName("TestError" + i); + list.add(failureUrl); + } + return list; + } + }, FailureUrlBhv.class.getCanonicalName()); + + assertEquals(0, crawlingConfigHelper.getExcludedUrlList("123").size()); + systemProperties.setProperty(Constants.FAILURE_COUNT_THRESHOLD_PROPERTY, "0"); + assertEquals(0, crawlingConfigHelper.getExcludedUrlList("123").size()); + errorCount.set(5); + assertEquals(5, crawlingConfigHelper.getExcludedUrlList("123").size()); + systemProperties.setProperty(Constants.IGNORE_FAILURE_TYPE_PROPERTY, "TestError0"); + assertEquals(4, crawlingConfigHelper.getExcludedUrlList("123").size()); + } + + public void test_getDefaultConfig() { + assertTrue(crawlingConfigHelper.getDefaultConfig(null).isEmpty()); + assertEquals("01T", crawlingConfigHelper.getDefaultConfig(ConfigType.WEB).get().getId()); + assertEquals("11T", crawlingConfigHelper.getDefaultConfig(ConfigType.FILE).get().getId()); + assertEquals("21T", crawlingConfigHelper.getDefaultConfig(ConfigType.DATA).get().getId()); + } +} From bf848c608e5817f76f18b5180127d578a8ce08c4 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Mon, 15 Jan 2024 22:25:26 +0900 Subject: [PATCH 12/69] fix #2798 Enhance IndexingHelper with additional JUnit tests --- .../codelibs/fess/helper/IndexingHelper.java | 92 ++- .../fess/helper/IndexingHelperTest.java | 533 ++++++++++++++++++ 2 files changed, 603 insertions(+), 22 deletions(-) create mode 100644 src/test/java/org/codelibs/fess/helper/IndexingHelperTest.java diff --git a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java index 419c2df195..1207f1f4a1 100644 --- a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java +++ b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java @@ -21,12 +21,14 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.lucene.search.TotalHits; import org.codelibs.fess.es.client.SearchEngineClient; import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.thumbnail.ThumbnailManager; import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.util.DocList; import org.codelibs.fess.util.MemoryUtil; +import org.opensearch.action.admin.indices.refresh.RefreshResponse; import org.opensearch.action.search.SearchResponse; import org.opensearch.index.query.QueryBuilder; import org.opensearch.index.query.QueryBuilders; @@ -52,19 +54,23 @@ public void sendDocuments(final SearchEngineClient searchEngineClient, final Doc try { if (fessConfig.isThumbnailCrawlerEnabled()) { final ThumbnailManager thumbnailManager = ComponentUtil.getThumbnailManager(); + final String thumbnailField = fessConfig.getIndexFieldThumbnail(); docList.stream().forEach(doc -> { if (!thumbnailManager.offer(doc)) { if (logger.isDebugEnabled()) { - logger.debug("Removing {}={} from doc[{}]", fessConfig.getIndexFieldThumbnail(), - doc.get(fessConfig.getIndexFieldThumbnail()), doc.get(fessConfig.getIndexFieldUrl())); + logger.debug("Removing {}={} from doc[{}]", thumbnailField, doc.get(thumbnailField), + doc.get(fessConfig.getIndexFieldUrl())); } - doc.remove(fessConfig.getIndexFieldThumbnail()); + doc.remove(thumbnailField); } }); } final CrawlingConfigHelper crawlingConfigHelper = ComponentUtil.getCrawlingConfigHelper(); synchronized (searchEngineClient) { - deleteOldDocuments(searchEngineClient, docList); + final long deletedDocCount = deleteOldDocuments(searchEngineClient, docList); + if (logger.isDebugEnabled()) { + logger.debug("Deleted {} old docs", deletedDocCount); + } searchEngineClient.addAll(fessConfig.getIndexDocumentUpdateIndex(), docList, (doc, builder) -> { final String configId = (String) doc.get(fessConfig.getIndexFieldConfigId()); crawlingConfigHelper.getPipeline(configId).ifPresent(s -> builder.setPipeline(s)); @@ -85,7 +91,7 @@ public void sendDocuments(final SearchEngineClient searchEngineClient, final Doc } } - private void deleteOldDocuments(final SearchEngineClient searchEngineClient, final DocList docList) { + protected long deleteOldDocuments(final SearchEngineClient searchEngineClient, final DocList docList) { final FessConfig fessConfig = ComponentUtil.getFessConfig(); final List docIdList = new ArrayList<>(); @@ -108,7 +114,7 @@ private void deleteOldDocuments(final SearchEngineClient searchEngineClient, fin new String[] { fessConfig.getIndexFieldId(), fessConfig.getIndexFieldDocId() }); for (final Map doc : docs) { final Object oldIdValue = doc.get(fessConfig.getIndexFieldId()); - if (!idValue.equals(oldIdValue) && oldIdValue != null) { + if (oldIdValue != null && !idValue.equals(oldIdValue)) { final Object oldDocIdValue = doc.get(fessConfig.getIndexFieldDocId()); if (oldDocIdValue != null) { docIdList.add(oldDocIdValue.toString()); @@ -120,9 +126,10 @@ private void deleteOldDocuments(final SearchEngineClient searchEngineClient, fin } } if (!docIdList.isEmpty()) { - searchEngineClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), + return deleteDocumentByQuery(searchEngineClient, fessConfig.getIndexDocumentUpdateIndex(), QueryBuilders.termsQuery(fessConfig.getIndexFieldDocId(), docIdList.stream().toArray(n -> new String[n]))); } + return 0L; } public boolean updateDocument(final SearchEngineClient searchEngineClient, final String id, final String field, final Object value) { @@ -137,19 +144,23 @@ public boolean deleteDocument(final SearchEngineClient searchEngineClient, final public long deleteDocumentByUrl(final SearchEngineClient searchEngineClient, final String url) { final FessConfig fessConfig = ComponentUtil.getFessConfig(); - return searchEngineClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), + return deleteDocumentByQuery(searchEngineClient, fessConfig.getIndexDocumentUpdateIndex(), QueryBuilders.termQuery(fessConfig.getIndexFieldUrl(), url)); } public long deleteDocumentsByDocId(final SearchEngineClient searchEngineClient, final List docIdList) { final FessConfig fessConfig = ComponentUtil.getFessConfig(); - return searchEngineClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), + return deleteDocumentByQuery(searchEngineClient, fessConfig.getIndexDocumentUpdateIndex(), QueryBuilders.termsQuery(fessConfig.getIndexFieldDocId(), docIdList.stream().toArray(n -> new String[n]))); } public long deleteDocumentByQuery(final SearchEngineClient searchEngineClient, final QueryBuilder queryBuilder) { final FessConfig fessConfig = ComponentUtil.getFessConfig(); - return searchEngineClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), queryBuilder); + return deleteDocumentByQuery(searchEngineClient, fessConfig.getIndexDocumentUpdateIndex(), queryBuilder); + } + + protected long deleteDocumentByQuery(final SearchEngineClient searchEngineClient, final String index, final QueryBuilder queryBuilder) { + return searchEngineClient.deleteByQuery(index, queryBuilder); } public Map getDocument(final SearchEngineClient searchEngineClient, final String id, final String[] fields) { @@ -168,9 +179,9 @@ public List> getDocumentListByPrefixId(final SearchEngineCli return getDocumentListByQuery(searchEngineClient, queryBuilder, fields); } - public void deleteChildDocument(final SearchEngineClient searchEngineClient, final String id) { + public long deleteChildDocument(final SearchEngineClient searchEngineClient, final String id) { final FessConfig fessConfig = ComponentUtil.getFessConfig(); - searchEngineClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), + return searchEngineClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), QueryBuilders.termQuery(fessConfig.getIndexFieldParentId(), id)); } @@ -185,9 +196,7 @@ protected List> getDocumentListByQuery(final SearchEngineCli final String[] fields) { final FessConfig fessConfig = ComponentUtil.getFessConfig(); - final SearchResponse countResponse = searchEngineClient.prepareSearch(fessConfig.getIndexDocumentUpdateIndex()) - .setQuery(queryBuilder).setSize(0).execute().actionGet(fessConfig.getIndexSearchTimeout()); - final long numFound = countResponse.getHits().getTotalHits().value; + final long numFound = getDocumentSizeByQuery(searchEngineClient, queryBuilder, fessConfig); final long maxSearchDocSize = fessConfig.getIndexerMaxSearchDocSizeAsInteger().longValue(); final boolean exceeded = numFound > maxSearchDocSize; if (exceeded) { @@ -217,35 +226,74 @@ protected List> getDocumentListByQuery(final SearchEngineCli }); } + protected long getDocumentSizeByQuery(final SearchEngineClient searchEngineClient, final QueryBuilder queryBuilder, + final FessConfig fessConfig) { + final SearchResponse countResponse = searchEngineClient.prepareSearch(fessConfig.getIndexDocumentUpdateIndex()) + .setQuery(queryBuilder).setSize(0).setTrackTotalHits(true).execute().actionGet(fessConfig.getIndexSearchTimeout()); + final TotalHits totalHits = countResponse.getHits().getTotalHits(); + if (totalHits != null) { + return totalHits.value; + } + return 0; + } + public long deleteBySessionId(final String sessionId) { + final SearchEngineClient searchEngineClient = ComponentUtil.getSearchEngineClient(); final FessConfig fessConfig = ComponentUtil.getFessConfig(); final String index = fessConfig.getIndexDocumentUpdateIndex(); + return deleteBySessionId(searchEngineClient, index, sessionId); + } + + public long deleteBySessionId(final SearchEngineClient searchEngineClient, final String index, final String sessionId) { + final FessConfig fessConfig = ComponentUtil.getFessConfig(); final QueryBuilder queryBuilder = QueryBuilders.termQuery(fessConfig.getIndexFieldSegment(), sessionId); - return deleteByQueryBuilder(index, queryBuilder); + return deleteByQueryBuilder(searchEngineClient, index, queryBuilder); } public long deleteByConfigId(final String configId) { + final SearchEngineClient searchEngineClient = ComponentUtil.getSearchEngineClient(); final FessConfig fessConfig = ComponentUtil.getFessConfig(); final String index = fessConfig.getIndexDocumentUpdateIndex(); + return deleteByConfigId(searchEngineClient, index, configId); + } + + public long deleteByConfigId(final SearchEngineClient searchEngineClient, final String index, final String configId) { + final FessConfig fessConfig = ComponentUtil.getFessConfig(); final QueryBuilder queryBuilder = QueryBuilders.termQuery(fessConfig.getIndexFieldConfigId(), configId); - return deleteByQueryBuilder(index, queryBuilder); + return deleteByQueryBuilder(searchEngineClient, index, queryBuilder); } public long deleteByVirtualHost(final String virtualHost) { + final SearchEngineClient searchEngineClient = ComponentUtil.getSearchEngineClient(); final FessConfig fessConfig = ComponentUtil.getFessConfig(); final String index = fessConfig.getIndexDocumentUpdateIndex(); + return deleteByVirtualHost(searchEngineClient, index, virtualHost); + } + + public long deleteByVirtualHost(final SearchEngineClient searchEngineClient, final String index, final String virtualHost) { + final FessConfig fessConfig = ComponentUtil.getFessConfig(); final QueryBuilder queryBuilder = QueryBuilders.termQuery(fessConfig.getIndexFieldVirtualHost(), virtualHost); - return deleteByQueryBuilder(index, queryBuilder); + return deleteByQueryBuilder(searchEngineClient, index, queryBuilder); } - protected long deleteByQueryBuilder(final String index, final QueryBuilder queryBuilder) { - final SearchEngineClient searchEngineClient = ComponentUtil.getSearchEngineClient(); - searchEngineClient.admin().indices().prepareRefresh(index).execute().actionGet(); + protected long deleteByQueryBuilder(final SearchEngineClient searchEngineClient, final String index, final QueryBuilder queryBuilder) { + refreshIndex(searchEngineClient, index); final long numOfDeleted = searchEngineClient.deleteByQuery(index, queryBuilder); - logger.info("Deleted {} old docs.", numOfDeleted); + if (logger.isDebugEnabled()) { + logger.debug("Deleted {} old docs.", numOfDeleted); + } return numOfDeleted; } + protected int refreshIndex(final SearchEngineClient searchEngineClient, final String index) { + final RefreshResponse response = searchEngineClient.admin().indices().prepareRefresh(index).execute().actionGet(); + if (logger.isDebugEnabled()) { + logger.debug("[{}] refresh status: {} ({}/{}/{})", index, response.getStatus(), response.getTotalShards(), + response.getSuccessfulShards(), response.getFailedShards()); + } + return response.getStatus().getStatus(); + } + public long calculateDocumentSize(final Map dataMap) { return MemoryUtil.sizeOf(dataMap); } diff --git a/src/test/java/org/codelibs/fess/helper/IndexingHelperTest.java b/src/test/java/org/codelibs/fess/helper/IndexingHelperTest.java new file mode 100644 index 0000000000..4d064ef65d --- /dev/null +++ b/src/test/java/org/codelibs/fess/helper/IndexingHelperTest.java @@ -0,0 +1,533 @@ +/* + * Copyright 2012-2023 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.helper; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.BiConsumer; +import java.util.stream.Collectors; + +import org.codelibs.fess.app.service.WebConfigService; +import org.codelibs.fess.es.client.SearchEngineClient; +import org.codelibs.fess.es.config.exentity.WebConfig; +import org.codelibs.fess.mylasta.direction.FessConfig; +import org.codelibs.fess.thumbnail.ThumbnailManager; +import org.codelibs.fess.unit.UnitFessTestCase; +import org.codelibs.fess.util.ComponentUtil; +import org.codelibs.fess.util.DocList; +import org.dbflute.optional.OptionalEntity; +import org.opensearch.action.index.IndexAction; +import org.opensearch.action.index.IndexRequestBuilder; +import org.opensearch.action.search.SearchAction; +import org.opensearch.action.search.SearchRequestBuilder; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryBuilders; +import org.opensearch.index.query.TermQueryBuilder; +import org.opensearch.index.query.TermsQueryBuilder; + +public class IndexingHelperTest extends UnitFessTestCase { + private IndexingHelper indexingHelper; + + private long documentSizeByQuery = 0L; + + @Override + public void setUp() throws Exception { + super.setUp(); + indexingHelper = new IndexingHelper() { + @Override + protected long getDocumentSizeByQuery(final SearchEngineClient searchEngineClient, final QueryBuilder queryBuilder, + final FessConfig fessConfig) { + return documentSizeByQuery; + } + + @Override + protected int refreshIndex(final SearchEngineClient searchEngineClient, final String index) { + return 200; + } + }; + indexingHelper.setMaxRetryCount(5); + indexingHelper.setDefaultRowSize(100); + indexingHelper.setRequestInterval(500); + ComponentUtil.register(indexingHelper, "indexingHelper"); + ComponentUtil.register(new ThumbnailManager(), "thumbnailManager"); + final CrawlingConfigHelper crawlingConfigHelper = new CrawlingConfigHelper(); + crawlingConfigHelper.init(); + ComponentUtil.register(crawlingConfigHelper, "crawlingConfigHelper"); + ComponentUtil.register(new WebConfigService() { + @Override + public OptionalEntity getWebConfig(final String id) { + final WebConfig webConfig = new WebConfig(); + webConfig.setId(id); + return OptionalEntity.of(webConfig); + } + }, WebConfigService.class.getCanonicalName()); + } + + public void test_sendDocuments() { + documentSizeByQuery = 0L; + final AtomicReference sentIndex = new AtomicReference<>(); + final List> sentDocList = new ArrayList<>(); + final SearchEngineClient client = new SearchEngineClient() { + @Override + public String[] addAll(final String index, final List> docList, + final BiConsumer, IndexRequestBuilder> options) { + sentIndex.set(index); + docList.forEach(x -> options.accept(x, new IndexRequestBuilder(this, IndexAction.INSTANCE))); + sentDocList.addAll(docList); + return docList.stream().map(x -> (String) x.get("id")).toArray(n -> new String[n]); + } + + @Override + public List> getDocumentList(final String index, final SearchCondition condition) { + return Collections.emptyList(); + } + }; + ComponentUtil.register(client, "searchEngineClient"); + final DocList docList = new DocList(); + indexingHelper.sendDocuments(client, docList); + assertEquals(0, docList.size()); + assertEquals(0, sentDocList.size()); + assertNull(sentIndex.get()); + + sentIndex.set(null); + sentDocList.clear(); + docList.add(new HashMap<>(Map.of(// + "_id", "001", // + "config_id", "W01", // + "url", "http://test.com/001"// + ))); + docList.add(new HashMap<>(Map.of(// + "_id", "002", // + "thumbnail", "http://test.com/002", // + "url", "http://test.com/002"// + ))); + indexingHelper.sendDocuments(client, docList); + assertEquals(0, docList.size()); + assertEquals(2, sentDocList.size()); + assertEquals("fess.update", sentIndex.get()); + } + + public void test_deleteOldDocuments() { + documentSizeByQuery = 0L; + final List deletedDocIdList = new ArrayList<>(); + final List> oldDocList = new ArrayList<>(); + final SearchEngineClient client = new SearchEngineClient() { + @Override + public List> getDocumentList(final String index, final SearchCondition condition) { + return oldDocList; + } + + @Override + public long deleteByQuery(final String index, final QueryBuilder queryBuilder) { + if (queryBuilder instanceof final TermsQueryBuilder termsQueryBuilder) { + termsQueryBuilder.values().stream().forEach(o -> deletedDocIdList.add(o.toString())); + } + return deletedDocIdList.size(); + } + }; + ComponentUtil.register(client, "searchEngineClient"); + final DocList docList = new DocList(); + assertEquals(0, indexingHelper.deleteOldDocuments(client, docList)); + assertEquals(0, docList.size()); + assertEquals(0, deletedDocIdList.size()); + + docList.clear(); + deletedDocIdList.clear(); + docList.add(new HashMap<>(Map.of(// + "config_id", "W01", // + "doc_id", "1", // + "url", "http://test.com/001"// + ))); + documentSizeByQuery = oldDocList.size(); + assertEquals(0, indexingHelper.deleteOldDocuments(client, docList)); + assertEquals(1, docList.size()); + assertEquals(0, deletedDocIdList.size()); + + docList.clear(); + deletedDocIdList.clear(); + docList.add(new HashMap<>(Map.of(// + "_id", "001", // + "doc_id", "1", // + "url", "http://test.com/001"// + ))); + documentSizeByQuery = oldDocList.size(); + assertEquals(0, indexingHelper.deleteOldDocuments(client, docList)); + assertEquals(1, docList.size()); + assertEquals(0, deletedDocIdList.size()); + + docList.clear(); + deletedDocIdList.clear(); + docList.add(new HashMap<>(Map.of(// + "_id", "001", // + "config_id", "W01", // + "doc_id", "1", // + "url", "http://test.com/001"// + ))); + documentSizeByQuery = oldDocList.size(); + assertEquals(0, indexingHelper.deleteOldDocuments(client, docList)); + assertEquals(1, docList.size()); + assertEquals(0, deletedDocIdList.size()); + + deletedDocIdList.clear(); + oldDocList.add(new HashMap<>(Map.of(// + "_id", "001", // same id + "config_id", "W01", // + "doc_id", "1", // + "url", "http://test.com/001"// + ))); + documentSizeByQuery = oldDocList.size(); + assertEquals(0, indexingHelper.deleteOldDocuments(client, docList)); + assertEquals(1, docList.size()); + assertEquals(0, deletedDocIdList.size()); + + deletedDocIdList.clear(); + oldDocList.clear(); + oldDocList.add(new HashMap<>(Map.of(// + "_id", "001_OLD", // same id + "config_id", "W01", // + "doc_id", "1", // + "url", "http://test.com/001"// + ))); + documentSizeByQuery = oldDocList.size(); + assertEquals(1, indexingHelper.deleteOldDocuments(client, docList)); + assertEquals(1, docList.size()); + assertEquals(1, deletedDocIdList.size()); + assertEquals("1", deletedDocIdList.get(0)); + } + + public void test_updateDocument() { + final Map resultMap = new HashMap<>(); + final SearchEngineClient client = new SearchEngineClient() { + @Override + public boolean update(final String index, final String id, final String field, final Object value) { + resultMap.put("index", index); + resultMap.put("id", id); + resultMap.put("field", field); + resultMap.put("value", value.toString()); + return true; + } + }; + ComponentUtil.register(client, "searchEngineClient"); + + final String id = "001"; + final String field = "content"; + final String value = "test"; + + assertTrue(indexingHelper.updateDocument(client, id, field, value)); + assertEquals("fess.update", resultMap.get("index")); + assertEquals(id, resultMap.get("id")); + assertEquals(field, resultMap.get("field")); + assertEquals(value, resultMap.get("value")); + } + + public void test_deleteDocument() { + final Map resultMap = new HashMap<>(); + final SearchEngineClient client = new SearchEngineClient() { + @Override + public boolean delete(final String index, final String id) { + resultMap.put("index", index); + resultMap.put("id", id); + return true; + } + }; + ComponentUtil.register(client, "searchEngineClient"); + + final String id = "001"; + + assertTrue(indexingHelper.deleteDocument(client, id)); + assertEquals("fess.update", resultMap.get("index")); + assertEquals(id, resultMap.get("id")); + } + + public void test_deleteDocumentByUrl() { + final Map resultMap = new HashMap<>(); + final SearchEngineClient client = new SearchEngineClient() { + @Override + public long deleteByQuery(final String index, final QueryBuilder queryBuilder) { + if (queryBuilder instanceof final TermQueryBuilder termQueryBuilder) { + resultMap.put("index", index); + resultMap.put("url", termQueryBuilder.value().toString()); + return 1; + } + return 0; + } + }; + ComponentUtil.register(client, "searchEngineClient"); + + final String url = "http://test.com/"; + + assertEquals(1, indexingHelper.deleteDocumentByUrl(client, url)); + assertEquals("fess.update", resultMap.get("index")); + assertEquals(url, resultMap.get("url")); + } + + public void test_deleteDocumentsByDocId() { + final Map resultMap = new HashMap<>(); + final SearchEngineClient client = new SearchEngineClient() { + @Override + public long deleteByQuery(final String index, final QueryBuilder queryBuilder) { + if (queryBuilder instanceof final TermsQueryBuilder termsQueryBuilder) { + resultMap.put("index", index); + resultMap.put("ids", termsQueryBuilder.values().stream().map(Object::toString).collect(Collectors.toList())); + return 1; + } + return 0; + } + }; + ComponentUtil.register(client, "searchEngineClient"); + + final List docList = new ArrayList<>(); + + indexingHelper.deleteDocumentsByDocId(client, docList); + assertEquals("fess.update", resultMap.get("index")); + assertEquals(0, ((List) resultMap.get("ids")).size()); + + docList.add("001"); + indexingHelper.deleteDocumentsByDocId(client, docList); + assertEquals("fess.update", resultMap.get("index")); + assertEquals(1, ((List) resultMap.get("ids")).size()); + assertEquals("001", ((List) resultMap.get("ids")).get(0)); + } + + public void test_deleteDocumentByQuery() { + final Map resultMap = new HashMap<>(); + final SearchEngineClient client = new SearchEngineClient() { + @Override + public long deleteByQuery(final String index, final QueryBuilder queryBuilder) { + if (queryBuilder instanceof final TermQueryBuilder termQueryBuilder) { + resultMap.put("index", index); + resultMap.put("url", termQueryBuilder.value().toString()); + return 1; + } + return 0; + } + }; + ComponentUtil.register(client, "searchEngineClient"); + + final String url = "http://test.com/"; + + assertEquals(1, indexingHelper.deleteDocumentByQuery(client, QueryBuilders.termQuery("fess.update", url))); + assertEquals("fess.update", resultMap.get("index")); + assertEquals(url, resultMap.get("url")); + } + + public void test_getDocument() { + final Map resultMap = new HashMap<>(); + final SearchEngineClient client = new SearchEngineClient() { + + @Override + public OptionalEntity> getDocument(final String index, + final SearchCondition condition) { + final SearchRequestBuilder builder = new SearchRequestBuilder(this, SearchAction.INSTANCE); + condition.build(builder); + resultMap.put("index", index); + resultMap.put("query", builder.toString()); + return OptionalEntity.of(Map.of("_id", "001", "title", "test1", "content", "test2")); + } + }; + ComponentUtil.register(client, "searchEngineClient"); + + final Map document = indexingHelper.getDocument(client, "001", new String[] { "title", "content" }); + assertEquals("fess.update", resultMap.get("index")); + assertEquals( + "{\"query\":{\"ids\":{\"values\":[\"001\"],\"boost\":1.0}},\"_source\":{\"includes\":[\"title\",\"content\"],\"excludes\":[]}}", + resultMap.get("query")); + assertEquals(3, document.size()); + } + + public void test_getDocumentListByPrefixId() { + documentSizeByQuery = 1L; + final Map resultMap = new HashMap<>(); + final SearchEngineClient client = new SearchEngineClient() { + @Override + public List> getDocumentList(final String index, final SearchCondition condition) { + final SearchRequestBuilder builder = new SearchRequestBuilder(this, SearchAction.INSTANCE); + condition.build(builder); + resultMap.put("index", index); + resultMap.put("query", builder.toString()); + final List> docList = new ArrayList<>(); + docList.add(Map.of("_id", "001", "title", "test1", "content", "test2")); + return docList; + } + }; + ComponentUtil.register(client, "searchEngineClient"); + + final List> documents = + indexingHelper.getDocumentListByPrefixId(client, "001", new String[] { "title", "content" }); + assertEquals("fess.update", resultMap.get("index")); + assertEquals( + "{\"size\":1,\"query\":{\"prefix\":{\"_id\":{\"value\":\"001\",\"boost\":1.0}}},\"_source\":{\"includes\":[\"title\",\"content\"],\"excludes\":[]}}", + resultMap.get("query")); + assertEquals(1, documents.size()); + } + + public void test_deleteChildDocument() { + final Map resultMap = new HashMap<>(); + final SearchEngineClient client = new SearchEngineClient() { + @Override + public long deleteByQuery(final String index, final QueryBuilder queryBuilder) { + if (queryBuilder instanceof final TermQueryBuilder termQueryBuilder) { + resultMap.put("index", index); + resultMap.put("id", termQueryBuilder.value().toString()); + resultMap.put("field", termQueryBuilder.fieldName()); + return 1; + } + return 0; + } + }; + ComponentUtil.register(client, "searchEngineClient"); + + final String id = "001"; + + assertEquals(1, indexingHelper.deleteChildDocument(client, id)); + assertEquals("fess.update", resultMap.get("index")); + assertEquals(id, resultMap.get("id")); + assertEquals("parent_id", resultMap.get("field")); + } + + public void test_getChildDocumentList() { + documentSizeByQuery = 1L; + final Map resultMap = new HashMap<>(); + final SearchEngineClient client = new SearchEngineClient() { + @Override + public List> getDocumentList(final String index, final SearchCondition condition) { + final SearchRequestBuilder builder = new SearchRequestBuilder(this, SearchAction.INSTANCE); + condition.build(builder); + resultMap.put("index", index); + resultMap.put("query", builder.toString()); + final List> docList = new ArrayList<>(); + docList.add(Map.of("_id", "001", "title", "test1", "content", "test2")); + return docList; + } + }; + ComponentUtil.register(client, "searchEngineClient"); + + final List> documents = indexingHelper.getChildDocumentList(client, "001", new String[] { "title", "content" }); + assertEquals("fess.update", resultMap.get("index")); + assertEquals( + "{\"size\":1,\"query\":{\"term\":{\"parent_id\":{\"value\":\"001\",\"boost\":1.0}}},\"_source\":{\"includes\":[\"title\",\"content\"],\"excludes\":[]}}", + resultMap.get("query")); + assertEquals(1, documents.size()); + } + + public void test_getDocumentListByQuery() { + documentSizeByQuery = 1L; + final Map resultMap = new HashMap<>(); + final SearchEngineClient client = new SearchEngineClient() { + @Override + public List> getDocumentList(final String index, final SearchCondition condition) { + final SearchRequestBuilder builder = new SearchRequestBuilder(this, SearchAction.INSTANCE); + condition.build(builder); + resultMap.put("index", index); + resultMap.put("query", builder.toString()); + final List> docList = new ArrayList<>(); + docList.add(Map.of("_id", "001", "title", "test1", "content", "test2")); + return docList; + } + }; + ComponentUtil.register(client, "searchEngineClient"); + + final List> documents = + indexingHelper.getDocumentListByQuery(client, QueryBuilders.idsQuery().addIds("001"), new String[] { "title", "content" }); + assertEquals("fess.update", resultMap.get("index")); + assertEquals( + "{\"size\":1,\"query\":{\"ids\":{\"values\":[\"001\"],\"boost\":1.0}},\"_source\":{\"includes\":[\"title\",\"content\"],\"excludes\":[]}}", + resultMap.get("query")); + assertEquals(1, documents.size()); + } + + public void test_deleteBySessionId() { + final Map resultMap = new HashMap<>(); + final SearchEngineClient client = new SearchEngineClient() { + @Override + public long deleteByQuery(final String index, final QueryBuilder queryBuilder) { + if (queryBuilder instanceof final TermQueryBuilder termQueryBuilder) { + resultMap.put("index", index); + resultMap.put("field", termQueryBuilder.fieldName()); + resultMap.put("value", termQueryBuilder.value().toString()); + return 1; + } + return 0; + } + }; + ComponentUtil.register(client, "searchEngineClient"); + + final String sessionId = "session1"; + + assertEquals(1, indexingHelper.deleteBySessionId(sessionId)); + assertEquals("fess.update", resultMap.get("index")); + assertEquals("segment", resultMap.get("field")); + assertEquals(sessionId, resultMap.get("value")); + } + + public void test_deleteByConfigId() { + final Map resultMap = new HashMap<>(); + final SearchEngineClient client = new SearchEngineClient() { + @Override + public long deleteByQuery(final String index, final QueryBuilder queryBuilder) { + if (queryBuilder instanceof final TermQueryBuilder termQueryBuilder) { + resultMap.put("index", index); + resultMap.put("field", termQueryBuilder.fieldName()); + resultMap.put("value", termQueryBuilder.value().toString()); + return 1; + } + return 0; + } + }; + ComponentUtil.register(client, "searchEngineClient"); + + final String configId = "W01"; + + assertEquals(1, indexingHelper.deleteByConfigId(configId)); + assertEquals("fess.update", resultMap.get("index")); + assertEquals("config_id", resultMap.get("field")); + assertEquals(configId, resultMap.get("value")); + } + + public void test_deleteByVirtualHost() { + final Map resultMap = new HashMap<>(); + final SearchEngineClient client = new SearchEngineClient() { + @Override + public long deleteByQuery(final String index, final QueryBuilder queryBuilder) { + if (queryBuilder instanceof final TermQueryBuilder termQueryBuilder) { + resultMap.put("index", index); + resultMap.put("field", termQueryBuilder.fieldName()); + resultMap.put("value", termQueryBuilder.value().toString()); + return 1; + } + return 0; + } + }; + ComponentUtil.register(client, "searchEngineClient"); + + final String virtualHost = "aaa"; + + assertEquals(1, indexingHelper.deleteByVirtualHost(virtualHost)); + assertEquals("fess.update", resultMap.get("index")); + assertEquals("virtual_host", resultMap.get("field")); + assertEquals(virtualHost, resultMap.get("value")); + } + + public void test_calculateDocumentSize() { + assertEquals(0, indexingHelper.calculateDocumentSize(Collections.emptyMap())); + assertEquals(118, indexingHelper.calculateDocumentSize(Map.of("id", "test"))); + assertEquals(249, indexingHelper.calculateDocumentSize(Map.of("id", "test", "url", "http://test.com/"))); + } +} From dfb42791dc551292dd1d5b72697d2fb2a836cfe8 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Sat, 20 Jan 2024 20:06:26 +0900 Subject: [PATCH 13/69] #2796 Added JUnit tests --- .../codelibs/fess/helper/SystemHelper.java | 24 ++- .../fess/helper/SystemHelperTest.java | 151 +++++++++++++++++- 2 files changed, 164 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java index 98b3b26eb1..d4d3dc86ec 100644 --- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java @@ -27,7 +27,9 @@ import java.net.UnknownHostException; import java.nio.file.Files; import java.nio.file.Path; +import java.time.Instant; import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; @@ -212,7 +214,7 @@ public String getUsername() { } public Date getCurrentTime() { - return new Date(); + return new Date(getCurrentTimeAsLong()); } public long getCurrentTimeAsLong() { @@ -220,7 +222,8 @@ public long getCurrentTimeAsLong() { } public LocalDateTime getCurrentTimeAsLocalDateTime() { - return LocalDateTime.now(); + final Instant instant = Instant.ofEpochMilli(getCurrentTimeAsLong()); + return LocalDateTime.ofInstant(instant, ZoneId.systemDefault()); } public String getLogFilePath() { @@ -333,23 +336,30 @@ public Pair[] getDesignJspFileNames() { return designJspFileNameMap.entrySet().stream().map(e -> new Pair<>(e.getKey(), e.getValue())).toArray(n -> new Pair[n]); } - public void refreshDesignJspFiles() { - final ServletContext servletContext = LaServletContextUtil.getServletContext(); + public List refreshDesignJspFiles() { + final List fileList = new ArrayList<>(); stream(ComponentUtil.getVirtualHostHelper().getVirtualHostPaths()) .of(stream -> stream.filter(s -> s != null && !"/".equals(s)).forEach(key -> { designJspFileNameMap.entrySet().stream().forEach(e -> { - final File jspFile = new File(servletContext.getRealPath("/WEB-INF/view" + key + "/" + e.getValue())); + final File jspFile = getDesignJspFile("/WEB-INF/view" + key + "/" + e.getValue()); if (!jspFile.exists()) { jspFile.getParentFile().mkdirs(); - final File baseJspFile = new File(servletContext.getRealPath("/WEB-INF/view/" + e.getValue())); + final File baseJspFile = getDesignJspFile("/WEB-INF/view/" + e.getValue()); try { - Files.copy(baseJspFile.toPath(), jspFile.toPath()); + final Path jspPath = jspFile.toPath(); + Files.copy(baseJspFile.toPath(), jspPath); + fileList.add(jspPath); } catch (final IOException ex) { logger.warn("Could not copy from {} to {}", baseJspFile.getAbsolutePath(), jspFile.getAbsolutePath(), ex); } } }); })); + return fileList; + } + + protected File getDesignJspFile(final String path) { + return new File(LaServletContextUtil.getServletContext().getRealPath(path)); } public boolean isForceStop() { diff --git a/src/test/java/org/codelibs/fess/helper/SystemHelperTest.java b/src/test/java/org/codelibs/fess/helper/SystemHelperTest.java index 4bea802ec9..c02b72dadc 100644 --- a/src/test/java/org/codelibs/fess/helper/SystemHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/SystemHelperTest.java @@ -18,16 +18,21 @@ import java.io.File; import java.nio.file.Path; import java.time.ZoneId; +import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; import java.util.stream.Stream; import org.codelibs.core.io.FileUtil; +import org.codelibs.core.lang.StringUtil; import org.codelibs.core.misc.Pair; +import org.codelibs.core.misc.Tuple3; +import org.codelibs.fess.exception.FessSystemException; import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.unit.UnitFessTestCase; import org.codelibs.fess.util.ComponentUtil; @@ -37,7 +42,7 @@ public class SystemHelperTest extends UnitFessTestCase { public SystemHelper systemHelper; - private Map envMap = new HashMap<>(); + private final Map envMap = new HashMap<>(); @Override public void setUp() throws Exception { @@ -45,6 +50,9 @@ public void setUp() throws Exception { final File propFile = File.createTempFile("project", ".properties"); propFile.deleteOnExit(); FileUtil.writeBytes(propFile.getAbsolutePath(), "fess.version=98.76.5".getBytes()); + final File desginJspRootFile = File.createTempFile("jsp", ""); + desginJspRootFile.delete(); + desginJspRootFile.deleteOnExit(); systemHelper = new SystemHelper() { @Override protected void parseProjectProperties(final Path propPath) { @@ -59,9 +67,15 @@ public void updateSystemProperties() { protected Map getEnvMap() { return envMap; } + + @Override + protected File getDesignJspFile(String path) { + return new File(desginJspRootFile, path); + } }; envMap.clear(); systemHelper.init(); + systemHelper.addShutdownHook(() -> {}); ComponentUtil.register(systemHelper, "systemHelper"); } @@ -74,7 +88,7 @@ public void test_getCurrentTimeAsLocalDateTime() { 1000 * systemHelper.getCurrentTimeAsLocalDateTime().atZone(ZoneId.systemDefault()).toInstant().getEpochSecond(); final long now = System.currentTimeMillis(); assertTrue(now + ">=" + current + " : " + (now - current), now >= current); - assertTrue((now - 1000) + "<" + current + " : " + (current - now + 1000), now - 1000 < current); + assertTrue(now - 1000 + "<" + current + " : " + (current - now + 1000), now - 1000 < current); } public void test_getLogFilePath() { @@ -90,10 +104,34 @@ public void test_getLogFilePath() { } public void test_getForumLink() { + getMockRequest().setLocale(Locale.ENGLISH); + assertEquals("https://discuss.codelibs.org/c/FessEN/", systemHelper.getForumLink()); + getMockRequest().setLocale(Locale.JAPANESE); + assertEquals("https://discuss.codelibs.org/c/FessJA/", systemHelper.getForumLink()); + getMockRequest().setLocale(Locale.ITALIAN); assertEquals("https://discuss.codelibs.org/c/FessEN/", systemHelper.getForumLink()); + getMockRequest().setLocale(null); + assertEquals("https://discuss.codelibs.org/c/FessEN/", systemHelper.getForumLink()); + ComponentUtil.setFessConfig(new FessConfig.SimpleImpl() { + private static final long serialVersionUID = 1L; + + @Override + public String getForumLink() { + return StringUtil.EMPTY; + } + }); + getMockRequest().setLocale(Locale.ENGLISH); + assertNull(systemHelper.getForumLink()); } public void test_getHelpLink() { + getMockRequest().setLocale(Locale.ENGLISH); + assertEquals("https://fess.codelibs.org/98.76/admin/xxx-guide.html", systemHelper.getHelpLink("xxx")); + getMockRequest().setLocale(Locale.JAPANESE); + assertEquals("https://fess.codelibs.org/ja/98.76/admin/xxx-guide.html", systemHelper.getHelpLink("xxx")); + getMockRequest().setLocale(Locale.ITALIAN); + assertEquals("https://fess.codelibs.org/98.76/admin/xxx-guide.html", systemHelper.getHelpLink("xxx")); + getMockRequest().setLocale(null); assertEquals("https://fess.codelibs.org/98.76/admin/xxx-guide.html", systemHelper.getHelpLink("xxx")); } @@ -128,9 +166,9 @@ public void test_abbreviateLongText() { } public void test_getLanguageItems() { - List> enItems = systemHelper.getLanguageItems(Locale.ENGLISH); + final List> enItems = systemHelper.getLanguageItems(Locale.ENGLISH); assertEquals(55, enItems.size()); - List> jaItems = systemHelper.getLanguageItems(Locale.JAPANESE); + final List> jaItems = systemHelper.getLanguageItems(Locale.JAPANESE); assertEquals(55, jaItems.size()); } @@ -152,6 +190,22 @@ public void test_getHostnamet() { public void test_isEoled() { assertEquals(systemHelper.getCurrentTimeAsLong() > systemHelper.eolTime, systemHelper.isEoled()); + final SystemHelper helper1 = new SystemHelper() { + @Override + public long getCurrentTimeAsLong() { + return systemHelper.eolTime + 1000L; + } + }; + helper1.eolTime = systemHelper.eolTime; + assertTrue(helper1.isEoled()); + final SystemHelper helper2 = new SystemHelper() { + @Override + public long getCurrentTimeAsLong() { + return systemHelper.eolTime - 1000L; + } + }; + helper2.eolTime = systemHelper.eolTime; + assertFalse(helper2.isEoled()); } public void test_updateConfiguration() { @@ -228,6 +282,28 @@ public void test_encodeUrlFilter() { path = "[]^$.*+?,{}|%\\"; assertEquals(path, systemHelper.encodeUrlFilter(path)); + + systemHelper.filterPathEncoding = null; + path = "あいう"; + assertEquals(path, systemHelper.encodeUrlFilter(path)); + + systemHelper.filterPathEncoding = "xxx"; + path = "あいう"; + assertEquals(path, systemHelper.encodeUrlFilter(path)); + } + + public void test_normalizeHtmlLang() { + assertEquals("ja", systemHelper.normalizeHtmlLang("ja")); + + ComponentUtil.setFessConfig(new FessConfig.SimpleImpl() { + private static final long serialVersionUID = 1L; + + @Override + public String getCrawlerDocumentHtmlDefaultLang() { + return "en"; + } + }); + assertEquals("en", systemHelper.normalizeHtmlLang("ja")); } public void test_normalizeLang() { @@ -275,6 +351,7 @@ public void test_createSearchRole() { ComponentUtil.setFessConfig(new FessConfig.SimpleImpl() { private static final long serialVersionUID = 1L; + @Override public boolean isLdapIgnoreNetbiosName() { return true; } @@ -288,6 +365,7 @@ public boolean isLdapIgnoreNetbiosName() { public void test_normalizeConfigPath() { assertEquals("", systemHelper.normalizeConfigPath("")); + assertEquals("", systemHelper.normalizeConfigPath("#hash")); assertEquals(".*\\Qwww.domain.com/test\\E.*", systemHelper.normalizeConfigPath("contains:www.domain.com/test")); assertEquals(".*\\Q/test/\\E.*", systemHelper.normalizeConfigPath("contains:/test/")); assertEquals("www.domain.com/test", systemHelper.normalizeConfigPath("www.domain.com/test")); @@ -334,4 +412,69 @@ public void test_getSearchRole() { assertEquals("R", systemHelper.getSearchRoleByRole("")); assertEquals("2", systemHelper.getSearchRoleByGroup("")); } + + public void test_parseProjectProperties() { + try { + new SystemHelper().parseProjectProperties(null); + assertTrue(false); + } catch (final FessSystemException e) { + // ok + } + } + + public void test_refreshDesignJspFiles() { + final VirtualHostHelper virtualHostHelper = new VirtualHostHelper(); + ComponentUtil.register(virtualHostHelper, "virtualHostHelper"); + final List> virtualHostList = new ArrayList<>(); + ComponentUtil.setFessConfig(new FessConfig.SimpleImpl() { + private static final long serialVersionUID = 1L; + + @SuppressWarnings("unchecked") + @Override + public Tuple3[] getVirtualHosts() { + return virtualHostList.toArray(n -> new Tuple3[n]); + } + }); + + List fileList = systemHelper.refreshDesignJspFiles(); + assertEquals(0, fileList.size()); + + virtualHostList.add(new Tuple3<>("abc.example.com", "8080", "host1")); + fileList = systemHelper.refreshDesignJspFiles(); + assertEquals(0, fileList.size()); + + systemHelper.addDesignJspFileName("xxx", "yyy.jsp"); + final File designJspFile = systemHelper.getDesignJspFile("/WEB-INF/view/yyy.jsp"); + designJspFile.getParentFile().mkdirs(); + FileUtil.writeBytes(designJspFile.getAbsolutePath(), "ok".getBytes()); + fileList = systemHelper.refreshDesignJspFiles(); + assertEquals(1, fileList.size()); + assertEquals("ok", FileUtil.readText(fileList.get(0).toFile())); + } + + public void test_updateSystemProperties() { + final SystemHelper helper = new SystemHelper(); + final AtomicReference appValue = new AtomicReference<>(StringUtil.EMPTY); + ComponentUtil.setFessConfig(new FessConfig.SimpleImpl() { + private static final long serialVersionUID = 1L; + + @Override + public String getAppValue() { + return appValue.get(); + } + + @Override + public String getAppEncryptPropertyPattern() { + return ".*password|.*key|.*token|.*secret"; + } + }); + final String now = String.valueOf(System.currentTimeMillis()); + helper.updateSystemProperties(); + assertNull(System.getProperty("fess." + now)); + assertNull(System.getProperty("test." + now)); + appValue.set("=abc\nfess." + now + "=test1\ntest." + now + "=test2"); + helper.updateSystemProperties(); + assertEquals("test1", System.getProperty("fess." + now)); + assertEquals("test2", System.getProperty("test." + now)); + } } From 0c07a74b92a99c354243e34de1f7b73ef8bbe645 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Sun, 21 Jan 2024 14:18:15 +0900 Subject: [PATCH 14/69] fix #2799 Refactor to centralize current time retrieval using systemHelper.getCurrentTimeAsLong() --- .../fess/app/job/AllJobScheduler.java | 4 +-- .../app/web/admin/esreq/AdminEsreqAction.java | 19 ++++++------ .../app/web/base/login/AzureAdCredential.java | 2 +- .../fess/crawler/FessCrawlerThread.java | 8 +++-- .../codelibs/fess/ds/DataStoreFactory.java | 3 +- .../FileListIndexUpdateCallbackImpl.java | 6 ++-- .../ds/callback/IndexUpdateCallbackImpl.java | 4 +-- .../fess/es/client/SearchEngineClient.java | 16 ++++++---- .../java/org/codelibs/fess/exec/Crawler.java | 11 +++---- .../fess/helper/CrawlerStatsHelper.java | 21 +++++++++----- .../codelibs/fess/helper/DataIndexHelper.java | 7 ++--- .../codelibs/fess/helper/DocumentHelper.java | 5 ++-- .../codelibs/fess/helper/IndexingHelper.java | 7 +++-- .../fess/helper/IntervalControlHelper.java | 3 +- .../codelibs/fess/helper/SearchHelper.java | 7 +++-- .../codelibs/fess/helper/SuggestHelper.java | 4 +-- .../codelibs/fess/helper/SystemHelper.java | 2 +- .../fess/helper/WebFsIndexHelper.java | 4 +-- .../codelibs/fess/indexer/IndexUpdater.java | 29 ++++++++++--------- .../org/codelibs/fess/ldap/LdapManager.java | 5 ++-- .../fess/sso/aad/AzureAdAuthenticator.java | 4 +-- .../fess/thumbnail/ThumbnailManager.java | 9 +++--- .../fess/thumbnail/impl/CommandGenerator.java | 2 +- .../codelibs/fess/util/GsaConfigParser.java | 4 +-- .../fess/helper/CrawlerStatsHelperTest.java | 2 ++ .../fess/helper/IndexingHelperTest.java | 1 + .../fess/util/GsaConfigParserTest.java | 7 +++++ 27 files changed, 114 insertions(+), 82 deletions(-) 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 a77e86399b..06471d79b7 100644 --- a/src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java +++ b/src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java @@ -66,7 +66,7 @@ public class AllJobScheduler implements LaJobScheduler { @Override public void schedule(final LaCron cron) { - schedulerTime = System.currentTimeMillis(); + schedulerTime = systemHelper.getCurrentTimeAsLong(); scheduledJobService.start(cron); final String myName = fessConfig.getSchedulerTargetName(); @@ -81,7 +81,7 @@ public void schedule(final LaCron cron) { if (logger.isDebugEnabled()) { logger.debug("Updating scheduled jobs. time:{}", schedulerTime); } - final long now = System.currentTimeMillis(); + final long now = systemHelper.getCurrentTimeAsLong(); scheduledJobService.getScheduledJobListAfter(schedulerTime).forEach(scheduledJob -> { if (logger.isDebugEnabled()) { logger.debug("Updating job schedule:{}", scheduledJob.getName()); diff --git a/src/main/java/org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.java b/src/main/java/org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.java index 78f4ef4a9a..5535bcf6e5 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.java @@ -104,15 +104,16 @@ public ActionResponse upload(final UploadForm form) { } throw e1; } - return asStream("es_" + System.currentTimeMillis() + ".json").contentTypeOctetStream().stream(out -> { - try (final InputStream in = new FileInputStream(tempFile)) { - out.write(in); - } finally { - if (tempFile.exists() && !tempFile.delete()) { - logger.warn("Failed to delete {}", tempFile.getAbsolutePath()); - } - } - }); + return asStream("es_" + ComponentUtil.getSystemHelper().getCurrentTimeAsLong() + ".json").contentTypeOctetStream() + .stream(out -> { + try (final InputStream in = new FileInputStream(tempFile)) { + out.write(in); + } finally { + if (tempFile.exists() && !tempFile.delete()) { + logger.warn("Failed to delete {}", tempFile.getAbsolutePath()); + } + } + }); } catch (final Exception e) { logger.warn("Failed to process request file: {}", form.requestFile.getFileName(), e); throwValidationError(messages -> messages.addErrorsInvalidHeaderForRequestFile(GLOBAL, e.getMessage()), diff --git a/src/main/java/org/codelibs/fess/app/web/base/login/AzureAdCredential.java b/src/main/java/org/codelibs/fess/app/web/base/login/AzureAdCredential.java index f0145f43fc..3bc5c1a1b6 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/login/AzureAdCredential.java +++ b/src/main/java/org/codelibs/fess/app/web/base/login/AzureAdCredential.java @@ -116,7 +116,7 @@ public String[] getPermissions() { @Override public boolean refresh() { - if (authResult.getExpiresAfter() < System.currentTimeMillis()) { + if (authResult.getExpiresAfter() < ComponentUtil.getSystemHelper().getCurrentTimeAsLong()) { return false; } final AzureAdAuthenticator authenticator = ComponentUtil.getComponent(AzureAdAuthenticator.class); diff --git a/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java b/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java index 4a489044c2..730cd82a0d 100644 --- a/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java +++ b/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java @@ -53,6 +53,7 @@ import org.codelibs.fess.helper.DuplicateHostHelper; import org.codelibs.fess.helper.IndexingHelper; import org.codelibs.fess.helper.PermissionHelper; +import org.codelibs.fess.helper.SystemHelper; import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.util.DocumentUtil; @@ -69,7 +70,8 @@ public class FessCrawlerThread extends CrawlerThread { protected boolean isContentUpdated(final CrawlerClient client, final UrlQueue urlQueue) { if (ComponentUtil.getFessConfig().isIncrementalCrawling()) { - final long startTime = System.currentTimeMillis(); + final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); + final long startTime = systemHelper.getCurrentTimeAsLong(); final FessConfig fessConfig = ComponentUtil.getFessConfig(); final CrawlingConfigHelper crawlingConfigHelper = ComponentUtil.getCrawlingConfigHelper(); @@ -119,7 +121,7 @@ protected boolean isContentUpdated(final CrawlerClient client, final UrlQueue } final Date expires = DocumentUtil.getValue(document, fessConfig.getIndexFieldExpires(), Date.class); - if (expires != null && expires.getTime() < System.currentTimeMillis()) { + if (expires != null && expires.getTime() < systemHelper.getCurrentTimeAsLong()) { final Object idValue = document.get(fessConfig.getIndexFieldId()); if (idValue != null && !indexingHelper.deleteDocument(searchEngineClient, idValue.toString())) { logger.debug("Failed to delete expired document: {}", url); @@ -160,7 +162,7 @@ protected boolean isContentUpdated(final CrawlerClient client, final UrlQueue log(logHelper, LogType.NOT_MODIFIED, crawlerContext, urlQueue); - responseData.setExecutionTime(System.currentTimeMillis() - startTime); + responseData.setExecutionTime(systemHelper.getCurrentTimeAsLong() - startTime); responseData.setParentUrl(urlQueue.getParentUrl()); responseData.setSessionId(crawlerContext.getSessionId()); responseData.setHttpStatusCode(org.codelibs.fess.crawler.Constants.NOT_MODIFIED_STATUS); diff --git a/src/main/java/org/codelibs/fess/ds/DataStoreFactory.java b/src/main/java/org/codelibs/fess/ds/DataStoreFactory.java index 1a49658397..4dea5d4554 100644 --- a/src/main/java/org/codelibs/fess/ds/DataStoreFactory.java +++ b/src/main/java/org/codelibs/fess/ds/DataStoreFactory.java @@ -37,6 +37,7 @@ import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.helper.PluginHelper; +import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.util.ResourceUtil; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; @@ -71,7 +72,7 @@ public DataStore getDataStore(final String name) { } public String[] getDataStoreNames() { - final long now = System.currentTimeMillis(); + final long now = ComponentUtil.getSystemHelper().getCurrentTimeAsLong(); if (now - lastLoadedTime > 60000L) { final List nameList = loadDataStoreNameList(); dataStoreNames = nameList.toArray(n -> new String[nameList.size()]); 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 8f1575d2e7..f0e7b7e438 100644 --- a/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java +++ b/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java @@ -54,6 +54,7 @@ import org.codelibs.fess.helper.CrawlerStatsHelper.StatsAction; import org.codelibs.fess.helper.CrawlerStatsHelper.StatsKeyObject; import org.codelibs.fess.helper.IndexingHelper; +import org.codelibs.fess.helper.SystemHelper; import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.util.ComponentUtil; import org.lastaflute.di.core.SingletonLaContainer; @@ -212,14 +213,15 @@ protected long getMaxAccessCount(final DataStoreParams paramMap, final Map dataMap, final String url, final CrawlerClient client) { - final long startTime = System.currentTimeMillis(); + final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); + final long startTime = systemHelper.getCurrentTimeAsLong(); final CrawlerStatsHelper crawlerStatsHelper = ComponentUtil.getCrawlerStatsHelper(); final StatsKeyObject keyObj = paramMap.get(Constants.CRAWLER_STATS_KEY) instanceof final StatsKeyObject sko ? sko : null; try (final ResponseData responseData = client.execute(RequestDataBuilder.newRequestData().get().url(url).build())) { if (responseData.getRedirectLocation() != null) { return responseData.getRedirectLocation(); } - responseData.setExecutionTime(System.currentTimeMillis() - startTime); + responseData.setExecutionTime(systemHelper.getCurrentTimeAsLong() - startTime); if (dataMap.containsKey(Constants.SESSION_ID)) { responseData.setSessionId((String) dataMap.get(Constants.SESSION_ID)); } else { diff --git a/src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallbackImpl.java b/src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallbackImpl.java index 1cc5d1b77b..6262ce3302 100644 --- a/src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallbackImpl.java +++ b/src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallbackImpl.java @@ -75,7 +75,7 @@ public void store(final DataStoreParams paramMap, final Map data final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); systemHelper.calibrateCpuLoad(); - final long startTime = System.currentTimeMillis(); + final long startTime = systemHelper.getCurrentTimeAsLong(); final FessConfig fessConfig = ComponentUtil.getFessConfig(); final SearchEngineClient searchEngineClient = ComponentUtil.getSearchEngineClient(); @@ -122,7 +122,7 @@ public void store(final DataStoreParams paramMap, final Map data docList.add(ingest(paramMap, dataMap)); final long contentSize = indexingHelper.calculateDocumentSize(dataMap); docList.addContentSize(contentSize); - final long processingTime = System.currentTimeMillis() - startTime; + final long processingTime = systemHelper.getCurrentTimeAsLong() - startTime; docList.addProcessingTime(processingTime); if (logger.isDebugEnabled()) { logger.debug("Added the document({}, {}ms). The number of a document cache is {}.", diff --git a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java b/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java index 24e10e5908..8f161550e8 100644 --- a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java +++ b/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java @@ -66,6 +66,7 @@ import org.codelibs.fess.exception.SearchQueryException; import org.codelibs.fess.helper.DocumentHelper; import org.codelibs.fess.helper.QueryHelper; +import org.codelibs.fess.helper.SystemHelper; import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.query.QueryFieldConfig; import org.codelibs.fess.util.BooleanFunction; @@ -755,7 +756,8 @@ protected void insertBulkData(final FessConfig fessConfig, final String configIn protected void waitForYellowStatus(final FessConfig fessConfig) { Exception cause = null; - final long startTime = System.currentTimeMillis(); + final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); + final long startTime = systemHelper.getCurrentTimeAsLong(); for (int i = 0; i < maxEsStatusRetry; i++) { try { final ClusterHealthResponse response = client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute() @@ -784,7 +786,7 @@ protected void waitForYellowStatus(final FessConfig fessConfig) { } final String message = "Fesen (" + SystemUtil.getSearchEngineHttpAddress() + ") is not available. Check the state of your Fesen cluster (" - + clusterName + ") in " + (System.currentTimeMillis() - startTime) + "ms."; + + clusterName + ") in " + (systemHelper.getCurrentTimeAsLong() - startTime) + "ms."; throw new ContainerInitFailureException(message, cause); } @@ -924,21 +926,23 @@ protected void deleteScrollContext(final String scrollId) { protected T get(final String index, final String id, final SearchCondition condition, final SearchResult searchResult) { - final long startTime = System.currentTimeMillis(); + final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); + final long startTime = systemHelper.getCurrentTimeAsLong(); GetResponse response = null; final GetRequestBuilder requestBuilder = client.prepareGet(index, id); if (condition.build(requestBuilder)) { response = requestBuilder.execute().actionGet(ComponentUtil.getFessConfig().getIndexSearchTimeout()); } - final long execTime = System.currentTimeMillis() - startTime; + final long execTime = systemHelper.getCurrentTimeAsLong() - startTime; return searchResult.build(requestBuilder, execTime, OptionalEntity.ofNullable(response, () -> {})); } public T search(final String index, final SearchCondition condition, final SearchResult searchResult) { - final long startTime = System.currentTimeMillis(); + final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); + final long startTime = systemHelper.getCurrentTimeAsLong(); SearchResponse searchResponse = null; final SearchRequestBuilder searchRequestBuilder = client.prepareSearch(index); @@ -966,7 +970,7 @@ public T search(final String index, final SearchCondition {})); } diff --git a/src/main/java/org/codelibs/fess/exec/Crawler.java b/src/main/java/org/codelibs/fess/exec/Crawler.java index e3d9e60116..e28c7048fa 100644 --- a/src/main/java/org/codelibs/fess/exec/Crawler.java +++ b/src/main/java/org/codelibs/fess/exec/Crawler.java @@ -54,6 +54,7 @@ import org.codelibs.fess.helper.DuplicateHostHelper; import org.codelibs.fess.helper.NotificationHelper; import org.codelibs.fess.helper.PathMappingHelper; +import org.codelibs.fess.helper.SystemHelper; import org.codelibs.fess.helper.WebFsIndexHelper; import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.mylasta.mail.CrawlerPostcard; @@ -471,8 +472,8 @@ public int doCrawl(final Options options) { } final PathMappingHelper pathMappingHelper = ComponentUtil.getPathMappingHelper(); - - final long totalTime = System.currentTimeMillis(); + final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); + final long totalTime = systemHelper.getCurrentTimeAsLong(); final CrawlingInfoHelper crawlingInfoHelper = ComponentUtil.getCrawlingInfoHelper(); @@ -494,8 +495,8 @@ public int doCrawl(final Options options) { } // delete expired sessions - crawlingInfoService.deleteSessionIdsBefore(options.sessionId, options.name, - ComponentUtil.getSystemHelper().getCurrentTimeAsLong()); + SystemHelper systemHelper2 = ComponentUtil.getSystemHelper(); + crawlingInfoService.deleteSessionIdsBefore(options.sessionId, options.name, systemHelper2.getCurrentTimeAsLong()); final List webConfigIdList = options.getWebConfigIdList(); final List fileConfigIdList = options.getFileConfigIdList(); @@ -544,7 +545,7 @@ public int doCrawl(final Options options) { 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)); + crawlingInfoHelper.putToInfoMap(Constants.CRAWLER_EXEC_TIME, Long.toString(systemHelper.getCurrentTimeAsLong() - totalTime)); } } diff --git a/src/main/java/org/codelibs/fess/helper/CrawlerStatsHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlerStatsHelper.java index 9ccaeb3edb..f0071e7340 100644 --- a/src/main/java/org/codelibs/fess/helper/CrawlerStatsHelper.java +++ b/src/main/java/org/codelibs/fess/helper/CrawlerStatsHelper.java @@ -25,6 +25,7 @@ import org.apache.logging.log4j.Logger; import org.codelibs.fess.crawler.entity.UrlQueue; import org.codelibs.fess.taglib.FessFunctions; +import org.codelibs.fess.util.ComponentUtil; import org.dbflute.optional.OptionalThing; import com.google.common.cache.CacheBuilder; @@ -85,7 +86,7 @@ public void begin(final Object keyObj) { try { statsCache.get(key); } catch (final Exception e) { - final StringBuilder buf = createStringBuffer(keyObj, System.currentTimeMillis()); + final StringBuilder buf = createStringBuffer(keyObj, getCurrentTimeMillis()); buf.append('\t').append("action:begin"); buf.append('\t').append("error:").append(escapeValue(e.getLocalizedMessage()).replaceAll("\\s", " ")); log(buf); @@ -102,10 +103,10 @@ public void record(final Object keyObj, final String action) { try { final StatsObject data = statsCache.getIfPresent(key); if (data != null) { - data.put(escapeValue(action), System.currentTimeMillis()); + data.put(escapeValue(action), getCurrentTimeMillis()); } } catch (final Exception e) { - final StringBuilder buf = createStringBuffer(keyObj, System.currentTimeMillis()); + final StringBuilder buf = createStringBuffer(keyObj, getCurrentTimeMillis()); buf.append('\t').append("action:record"); buf.append('\t').append("error:").append(escapeValue(e.getLocalizedMessage()).replaceAll("\\s", " ")); log(buf); @@ -125,7 +126,7 @@ public void done(final Object keyObj) { } } } catch (final Exception e) { - final StringBuilder buf = createStringBuffer(keyObj, System.currentTimeMillis()); + final StringBuilder buf = createStringBuffer(keyObj, getCurrentTimeMillis()); buf.append('\t').append("action:done"); buf.append('\t').append("error:").append(escapeValue(e.getLocalizedMessage()).replaceAll("\\s", " ")); log(buf); @@ -141,7 +142,7 @@ public void discard(final Object keyObj) { statsCache.invalidate(key); } } catch (final Exception e) { - final StringBuilder buf = createStringBuffer(keyObj, System.currentTimeMillis()); + final StringBuilder buf = createStringBuffer(keyObj, getCurrentTimeMillis()); buf.append('\t').append("action:done"); buf.append('\t').append("error:").append(escapeValue(e.getLocalizedMessage()).replaceAll("\\s", " ")); log(buf); @@ -152,7 +153,7 @@ public void discard(final Object keyObj) { protected void printStats(final Object keyObj, final StatsObject data, final long begin, final boolean done) { final StringBuilder buf = createStringBuffer(keyObj, begin); if (done) { - buf.append('\t').append("done:").append(System.currentTimeMillis() - begin); + buf.append('\t').append("done:").append(getCurrentTimeMillis() - begin); } data.entrySet().stream().map(e -> escapeValue(e.getKey()) + ":" + (e.getValue().longValue() - begin)).map(s -> "\t" + s) .forEach(s -> buf.append(s)); @@ -167,7 +168,7 @@ public void runOnThread(final Object keyObj) { data.increment(); } } catch (final Exception e) { - final StringBuilder buf = createStringBuffer(keyObj, System.currentTimeMillis()); + final StringBuilder buf = createStringBuffer(keyObj, getCurrentTimeMillis()); buf.append('\t').append("action:record"); buf.append('\t').append("error:").append(escapeValue(e.getLocalizedMessage()).replaceAll("\\s", " ")); log(buf); @@ -175,6 +176,10 @@ public void runOnThread(final Object keyObj) { }); } + protected long getCurrentTimeMillis() { + return ComponentUtil.getSystemHelper().getCurrentTimeAsLong(); + } + private StringBuilder createStringBuffer(final Object keyObj, final long time) { final StringBuilder buf = new StringBuilder(1000); buf.append("url:").append(getUrl(keyObj)); @@ -267,7 +272,7 @@ public static class StatsObject extends LinkedHashMap { protected final AtomicInteger count; public StatsObject() { - put(BEGIN_KEY, System.currentTimeMillis()); + put(BEGIN_KEY, ComponentUtil.getSystemHelper().getCurrentTimeAsLong()); count = new AtomicInteger(1); } diff --git a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java index 51bb29a735..8332b5a19b 100644 --- a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java +++ b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java @@ -82,7 +82,8 @@ public void crawl(final String sessionId, final List configIdList) { protected void doCrawl(final String sessionId, final List configList) { final int multiprocessCrawlingCount = ComponentUtil.getFessConfig().getCrawlingThreadCount(); - final long startTime = System.currentTimeMillis(); + final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); + final long startTime = systemHelper.getCurrentTimeAsLong(); final IndexUpdateCallback indexUpdateCallback = ComponentUtil.getComponent(IndexUpdateCallback.class); @@ -107,8 +108,6 @@ protected void doCrawl(final String sessionId, final List configList } - final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); - int startedCrawlerNum = 0; int activeCrawlerNum = 0; while (startedCrawlerNum < dataCrawlingThreadList.size()) { @@ -160,7 +159,7 @@ protected void doCrawl(final String sessionId, final List configList // put cralwing info final CrawlingInfoHelper crawlingInfoHelper = ComponentUtil.getCrawlingInfoHelper(); - final long execTime = System.currentTimeMillis() - startTime; + final long execTime = systemHelper.getCurrentTimeAsLong() - startTime; crawlingInfoHelper.putToInfoMap(Constants.DATA_CRAWLING_EXEC_TIME, Long.toString(execTime)); if (logger.isInfoEnabled()) { logger.info("[EXEC TIME] crawling time: {}ms", execTime); diff --git a/src/main/java/org/codelibs/fess/helper/DocumentHelper.java b/src/main/java/org/codelibs/fess/helper/DocumentHelper.java index 1d67e872a2..9fc80971ce 100644 --- a/src/main/java/org/codelibs/fess/helper/DocumentHelper.java +++ b/src/main/java/org/codelibs/fess/helper/DocumentHelper.java @@ -184,14 +184,15 @@ public Map processRequest(final CrawlingConfig crawlingConfig, f throw new CrawlingAccessException("CrawlerClient is null for " + url); } - final long startTime = System.currentTimeMillis(); + final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); + final long startTime = systemHelper.getCurrentTimeAsLong(); try (final ResponseData responseData = client.execute(RequestDataBuilder.newRequestData().get().url(url).build())) { if (responseData.getRedirectLocation() != null) { final Set childUrlList = new HashSet<>(); childUrlList.add(RequestDataBuilder.newRequestData().get().url(responseData.getRedirectLocation()).build()); throw new ChildUrlsException(childUrlList, this.getClass().getName() + "#RedirectedFrom:" + url); } - responseData.setExecutionTime(System.currentTimeMillis() - startTime); + responseData.setExecutionTime(systemHelper.getCurrentTimeAsLong() - startTime); responseData.setSessionId(crawlingInfoId); final RuleManager ruleManager = SingletonLaContainer.getComponent(RuleManager.class); diff --git a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java index 1207f1f4a1..699e1db3ea 100644 --- a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java +++ b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java @@ -47,7 +47,8 @@ public void sendDocuments(final SearchEngineClient searchEngineClient, final Doc return; } final FessConfig fessConfig = ComponentUtil.getFessConfig(); - final long execTime = System.currentTimeMillis(); + final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); + final long execTime = systemHelper.getCurrentTimeAsLong(); if (logger.isDebugEnabled()) { logger.debug("Sending {} documents to a server.", docList.size()); } @@ -79,10 +80,10 @@ public void sendDocuments(final SearchEngineClient searchEngineClient, final Doc if (logger.isInfoEnabled()) { if (docList.getContentSize() > 0) { logger.info("Sent {} docs (Doc:{process {}ms, send {}ms, size {}}, {})", docList.size(), docList.getProcessingTime(), - (System.currentTimeMillis() - execTime), MemoryUtil.byteCountToDisplaySize(docList.getContentSize()), + (systemHelper.getCurrentTimeAsLong() - execTime), MemoryUtil.byteCountToDisplaySize(docList.getContentSize()), MemoryUtil.getMemoryUsageLog()); } else { - logger.info("Sent {} docs (Doc:{send {}ms}, {})", docList.size(), (System.currentTimeMillis() - execTime), + logger.info("Sent {} docs (Doc:{send {}ms}, {})", docList.size(), (systemHelper.getCurrentTimeAsLong() - execTime), MemoryUtil.getMemoryUsageLog()); } } diff --git a/src/main/java/org/codelibs/fess/helper/IntervalControlHelper.java b/src/main/java/org/codelibs/fess/helper/IntervalControlHelper.java index d0b66004a4..31d5dc5e1e 100644 --- a/src/main/java/org/codelibs/fess/helper/IntervalControlHelper.java +++ b/src/main/java/org/codelibs/fess/helper/IntervalControlHelper.java @@ -21,6 +21,7 @@ import org.codelibs.core.lang.ThreadUtil; import org.codelibs.fess.exception.FessSystemException; +import org.codelibs.fess.util.ComponentUtil; public class IntervalControlHelper { @@ -61,7 +62,7 @@ protected long getDelay() { protected Calendar getCurrentCal() { final Calendar cal = Calendar.getInstance(); - cal.setTimeInMillis(System.currentTimeMillis()); + cal.setTimeInMillis(ComponentUtil.getSystemHelper().getCurrentTimeAsLong()); return cal; } diff --git a/src/main/java/org/codelibs/fess/helper/SearchHelper.java b/src/main/java/org/codelibs/fess/helper/SearchHelper.java index 10a5b7f912..630a4d43c6 100644 --- a/src/main/java/org/codelibs/fess/helper/SearchHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SearchHelper.java @@ -76,8 +76,9 @@ public class SearchHelper { // ============== public void search(final SearchRequestParams params, final SearchRenderData data, final OptionalThing userBean) { - final long requestedTime = ComponentUtil.getSystemHelper().getCurrentTimeAsLong(); - final long startTime = System.currentTimeMillis(); + final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); + final long startTime = systemHelper.getCurrentTimeAsLong(); + final long requestedTime = startTime; LaRequestUtil.getOptionalRequest().ifPresent(request -> { request.setAttribute(Constants.REQUEST_LANGUAGES, params.getLanguages()); @@ -112,7 +113,7 @@ public void search(final SearchRequestParams params, final SearchRenderData data data.setAppendHighlightParams(buf.toString()); } - queryResponseList.setExecTime(System.currentTimeMillis() - startTime); + queryResponseList.setExecTime(systemHelper.getCurrentTimeAsLong() - startTime); final NumberFormat nf = NumberFormat.getInstance(params.getLocale()); nf.setMaximumIntegerDigits(2); nf.setMaximumFractionDigits(2); diff --git a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java index a9de11a3f0..091fa933cc 100644 --- a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java @@ -224,8 +224,8 @@ public void indexFromDocuments(final Consumer success, final Consumer flist = new ArrayList<>(); - flist.add(new FunctionScoreQueryBuilder.FilterFunctionBuilder( - ScoreFunctionBuilders.randomFunction().seed(System.currentTimeMillis()).setField(fessConfig.getIndexFieldDocId()))); + flist.add(new FunctionScoreQueryBuilder.FilterFunctionBuilder(ScoreFunctionBuilders.randomFunction() + .seed(ComponentUtil.getSystemHelper().getCurrentTimeAsLong()).setField(fessConfig.getIndexFieldDocId()))); reader.setQuery(QueryBuilders .functionScoreQuery(QueryBuilders.matchAllQuery(), flist.toArray(new FunctionScoreQueryBuilder.FilterFunctionBuilder[flist.size()])) diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java index d4d3dc86ec..c6912e083f 100644 --- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java @@ -641,7 +641,7 @@ public void waitForNoWaitingThreads() { } protected short getSystemCpuPercent() { - final long now = System.currentTimeMillis(); + final long now = getCurrentTimeAsLong(); if (now - systemCpuCheckTime > systemCpuCheckInterval) { synchronized (this) { if (now - systemCpuCheckTime > systemCpuCheckInterval) { diff --git a/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java b/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java index df93755130..e1a6e2e5d2 100644 --- a/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java +++ b/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java @@ -94,7 +94,7 @@ protected void doCrawl(final String sessionId, final List webConfigLi final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); final FessConfig fessConfig = ComponentUtil.getFessConfig(); - final long startTime = System.currentTimeMillis(); + final long startTime = systemHelper.getCurrentTimeAsLong(); final List sessionIdList = new ArrayList<>(); crawlerList.clear(); @@ -443,7 +443,7 @@ protected void doCrawl(final String sessionId, final List webConfigLi // put cralwing info final CrawlingInfoHelper crawlingInfoHelper = ComponentUtil.getCrawlingInfoHelper(); - final long execTime = System.currentTimeMillis() - startTime; + final long execTime = systemHelper.getCurrentTimeAsLong() - startTime; crawlingInfoHelper.putToInfoMap(Constants.WEB_FS_CRAWLING_EXEC_TIME, Long.toString(execTime)); if (logger.isInfoEnabled()) { logger.info("[EXEC TIME] crawling time: {}ms", execTime); diff --git a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java index 88c9ebe0fc..b20531f200 100644 --- a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java +++ b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java @@ -188,7 +188,7 @@ public void run() { final DocList docList = new DocList(); final List accessResultList = new ArrayList<>(); - long updateTime = System.currentTimeMillis(); + long updateTime = systemHelper.getCurrentTimeAsLong(); int errorCount = 0; int emptyListCount = 0; long cleanupTime = -1; @@ -200,7 +200,7 @@ public void run() { docList.clear(); accessResultList.clear(); - updateTime = System.currentTimeMillis() - updateTime; + updateTime = systemHelper.getCurrentTimeAsLong() - updateTime; final long interval = updateInterval - updateTime; if (interval > 0) { @@ -217,7 +217,7 @@ public void run() { logger.debug("Processing documents in IndexUpdater queue."); } - updateTime = System.currentTimeMillis(); + updateTime = systemHelper.getCurrentTimeAsLong(); List arList = getAccessResultList(cb, cleanupTime); if (arList.isEmpty()) { @@ -246,7 +246,7 @@ public void run() { cleanupFinishedSessionData(); } } - executeTime += System.currentTimeMillis() - updateTime; + executeTime += systemHelper.getCurrentTimeAsLong() - updateTime; if (logger.isDebugEnabled()) { logger.debug("Processed documents in IndexUpdater queue."); @@ -339,7 +339,7 @@ private void processAccessResults(final DocList docList, final List accessResultData = getAccessResultData(accessResult); if (accessResultData != null) { accessResult.setAccessResultData(null); @@ -371,7 +371,7 @@ private void processAccessResults(final DocList docList, final List map) { private long cleanupAccessResults(final List accessResultList) { if (!accessResultList.isEmpty()) { - final long execTime = System.currentTimeMillis(); + final long execTime = systemHelper.getCurrentTimeAsLong(); final int size = accessResultList.size(); dataService.update(accessResultList); accessResultList.clear(); - final long time = System.currentTimeMillis() - execTime; + final long time = systemHelper.getCurrentTimeAsLong() - execTime; if (logger.isDebugEnabled()) { logger.debug("Updated {} access results. The execution time is {}ms.", size, time); } @@ -502,7 +502,7 @@ private List getAccessResultList(final Consumer arList = ((EsDataService) dataService).getAccessResultList(cb); final FessConfig fessConfig = ComponentUtil.getFessConfig(); if (!arList.isEmpty()) { @@ -522,7 +522,7 @@ private List getAccessResultList(final Consumer= 0) { buf.append(", cleanup ").append(cleanupTime).append("ms"); } @@ -543,22 +543,23 @@ private List getAccessResultList(final Consumer list = Collections.list(holder.get().search(baseDn, filter, controls)); if (logger.isDebugEnabled()) { - logger.debug("LDAP search[{}ms]: {} - {}", System.currentTimeMillis() - startTime, baseDn, filter); + logger.debug("LDAP search[{}ms]: {} - {}", systemHelper.getCurrentTimeAsLong() - startTime, baseDn, filter); } consumer.accept(list); } catch (final NamingException e) { 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 536cc4a15a..3dc015ac69 100644 --- a/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java +++ b/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java @@ -168,7 +168,7 @@ protected void storeStateInSession(final HttpSession session, final String state stateMap = new HashMap<>(); session.setAttribute(STATES, stateMap); } - final StateData stateData = new StateData(nonce, System.currentTimeMillis()); + final StateData stateData = new StateData(nonce, ComponentUtil.getSystemHelper().getCurrentTimeAsLong()); if (logger.isDebugEnabled()) { logger.debug("store {} in session", stateData); } @@ -319,7 +319,7 @@ protected StateData removeStateFromSession(final HttpSession session, final Stri @SuppressWarnings("unchecked") final Map states = (Map) session.getAttribute(STATES); if (states != null) { - final long now = System.currentTimeMillis(); + final long now = ComponentUtil.getSystemHelper().getCurrentTimeAsLong(); states.entrySet().stream().filter(e -> (now - e.getValue().getExpiration()) / 1000L > getStateTtl()).map(Map.Entry::getKey) .collect(Collectors.toList()).forEach(s -> { if (logger.isDebugEnabled()) { diff --git a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java index c2317f7739..5309dc230c 100644 --- a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java +++ b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java @@ -236,7 +236,8 @@ public int generate(final ExecutorService executorService, final boolean cleanup } protected void process(final FessConfig fessConfig, final ThumbnailQueue entity) { - ComponentUtil.getSystemHelper().calibrateCpuLoad(); + final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); + systemHelper.calibrateCpuLoad(); if (logger.isDebugEnabled()) { logger.debug("Processing thumbnail: {}", entity); @@ -245,14 +246,14 @@ protected void process(final FessConfig fessConfig, final ThumbnailQueue entity) try { final File outputFile = new File(baseDir, entity.getPath()); final File noImageFile = new File(outputFile.getAbsolutePath() + NOIMAGE_FILE_SUFFIX); - if (!noImageFile.isFile() || System.currentTimeMillis() - noImageFile.lastModified() > noImageExpired) { + if (!noImageFile.isFile() || systemHelper.getCurrentTimeAsLong() - noImageFile.lastModified() > noImageExpired) { if (noImageFile.isFile() && !noImageFile.delete()) { logger.warn("Failed to delete {}", noImageFile.getAbsolutePath()); } final ThumbnailGenerator generator = ComponentUtil.getComponent(generatorName); if (generator.isAvailable()) { if (!generator.generate(entity.getThumbnailId(), outputFile)) { - new File(outputFile.getAbsolutePath() + NOIMAGE_FILE_SUFFIX).setLastModified(System.currentTimeMillis()); + new File(outputFile.getAbsolutePath() + NOIMAGE_FILE_SUFFIX).setLastModified(systemHelper.getCurrentTimeAsLong()); } else { final long interval = fessConfig.getThumbnailGeneratorIntervalAsInteger().longValue(); if (interval > 0) { @@ -448,7 +449,7 @@ public FileVisitResult preVisitDirectory(final Path dir, final BasicFileAttribut @Override public FileVisitResult visitFile(final Path file, final BasicFileAttributes attrs) throws IOException { - if (System.currentTimeMillis() - Files.getLastModifiedTime(file).toMillis() > expiry) { + if (ComponentUtil.getSystemHelper().getCurrentTimeAsLong() - Files.getLastModifiedTime(file).toMillis() > expiry) { deletedFileList.add(file); if (deletedFileList.size() > maxPurgeSize) { deleteFiles(); diff --git a/src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java b/src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java index 355384dcd4..eb7fb55eef 100644 --- a/src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java +++ b/src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java @@ -57,7 +57,7 @@ public void init() { if (baseDir == null) { baseDir = new File(System.getProperty("java.io.tmpdir")); } - destoryTimer = new Timer("CommandGeneratorDestoryTimer-" + System.currentTimeMillis(), true); + destoryTimer = new Timer("CommandGeneratorDestoryTimer-" + ComponentUtil.getSystemHelper().getCurrentTimeAsLong(), true); updateProperties(); } diff --git a/src/main/java/org/codelibs/fess/util/GsaConfigParser.java b/src/main/java/org/codelibs/fess/util/GsaConfigParser.java index 15e138934f..8d0d0d246f 100644 --- a/src/main/java/org/codelibs/fess/util/GsaConfigParser.java +++ b/src/main/java/org/codelibs/fess/util/GsaConfigParser.java @@ -126,7 +126,7 @@ public void startElement(final String uri, final String localName, final String throw new GsaConfigException("Invalid format."); } if (COLLECTION.equalsIgnoreCase(qName) && COLLECTIONS.equalsIgnoreCase(tagQueue.peekLast())) { - final long now = System.currentTimeMillis(); + final long now = ComponentUtil.getSystemHelper().getCurrentTimeAsLong(); final String name = attributes.getValue("Name"); labelType = new LabelType(); labelType.setName(name); @@ -165,7 +165,7 @@ public void endElement(final String uri, final String localName, final String qN } else if (GLOBALPARAMS.equalsIgnoreCase(qName)) { final Object startUrls = globalParams.get(START_URLS); if (startUrls != null) { - final long now = System.currentTimeMillis(); + final long now = ComponentUtil.getSystemHelper().getCurrentTimeAsLong(); final List urlList = split(startUrls.toString(), "\n") .get(stream -> stream.map(String::trim).filter(StringUtil::isNotBlank).collect(Collectors.toList())); diff --git a/src/test/java/org/codelibs/fess/helper/CrawlerStatsHelperTest.java b/src/test/java/org/codelibs/fess/helper/CrawlerStatsHelperTest.java index 64116b34b6..1bbdcf83d6 100644 --- a/src/test/java/org/codelibs/fess/helper/CrawlerStatsHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/CrawlerStatsHelperTest.java @@ -19,6 +19,7 @@ import org.apache.logging.log4j.Logger; import org.codelibs.fess.helper.CrawlerStatsHelper.StatsKeyObject; import org.codelibs.fess.unit.UnitFessTestCase; +import org.codelibs.fess.util.ComponentUtil; public class CrawlerStatsHelperTest extends UnitFessTestCase { @@ -31,6 +32,7 @@ public class CrawlerStatsHelperTest extends UnitFessTestCase { @Override public void setUp() throws Exception { super.setUp(); + ComponentUtil.register(new SystemHelper(), "systemHelper"); crawlerStatsHelper = new CrawlerStatsHelper() { @Override protected void log(final StringBuilder buf) { diff --git a/src/test/java/org/codelibs/fess/helper/IndexingHelperTest.java b/src/test/java/org/codelibs/fess/helper/IndexingHelperTest.java index 4d064ef65d..88fb28b556 100644 --- a/src/test/java/org/codelibs/fess/helper/IndexingHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/IndexingHelperTest.java @@ -50,6 +50,7 @@ public class IndexingHelperTest extends UnitFessTestCase { @Override public void setUp() throws Exception { super.setUp(); + ComponentUtil.register(new SystemHelper(), "systemHelper"); indexingHelper = new IndexingHelper() { @Override protected long getDocumentSizeByQuery(final SearchEngineClient searchEngineClient, final QueryBuilder queryBuilder, diff --git a/src/test/java/org/codelibs/fess/util/GsaConfigParserTest.java b/src/test/java/org/codelibs/fess/util/GsaConfigParserTest.java index 78e5d5e2bd..2711fbc955 100644 --- a/src/test/java/org/codelibs/fess/util/GsaConfigParserTest.java +++ b/src/test/java/org/codelibs/fess/util/GsaConfigParserTest.java @@ -20,11 +20,18 @@ import org.codelibs.core.io.ResourceUtil; import org.codelibs.fess.es.config.exentity.LabelType; +import org.codelibs.fess.helper.SystemHelper; import org.codelibs.fess.unit.UnitFessTestCase; import org.xml.sax.InputSource; public class GsaConfigParserTest extends UnitFessTestCase { + @Override + public void setUp() throws Exception { + super.setUp(); + ComponentUtil.register(new SystemHelper(), "systemHelper"); + } + public void test_parse() throws IOException { GsaConfigParser parser = new GsaConfigParser(); try (InputStream is = ResourceUtil.getResourceAsStream("data/gsaconfig.xml")) { From 38108ad8106faa2f443a7bafc0f58ae78567b682 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 25 Jan 2024 15:36:47 +0900 Subject: [PATCH 15/69] fix #2800 Handle Exceptions in Suggester Instance Initialization --- .../codelibs/fess/helper/SuggestHelper.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java index 091fa933cc..713e1db053 100644 --- a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java @@ -109,19 +109,22 @@ public void init() { settingsBuilder.indicesTimeout(fessConfig.getIndexIndicesTimeout()); settingsBuilder.searchTimeout(fessConfig.getIndexSearchTimeout()); suggester = Suggester.builder().settings(settingsBuilder).build(searchEngineClient, fessConfig.getIndexDocumentSuggestIndex()); - suggester.settings().array().delete(SuggestSettings.DefaultKeys.SUPPORTED_FIELDS); - split(fessConfig.getSuggestFieldIndexContents(), ",").of(stream -> stream.filter(StringUtil::isNotBlank).forEach(field -> { - try { - suggester.settings().array().add(SuggestSettings.DefaultKeys.SUPPORTED_FIELDS, field); - } catch (final SuggestSettingsException e) { - logger.warn("Failed to add {}", field, e); - } - })); - suggester.createIndexIfNothing(); - if (ComponentUtil.hasPopularWordHelper()) { popularWordHelper = ComponentUtil.getPopularWordHelper(); } + try { + suggester.settings().array().delete(SuggestSettings.DefaultKeys.SUPPORTED_FIELDS); + split(fessConfig.getSuggestFieldIndexContents(), ",").of(stream -> stream.filter(StringUtil::isNotBlank).forEach(field -> { + try { + suggester.settings().array().add(SuggestSettings.DefaultKeys.SUPPORTED_FIELDS, field); + } catch (final SuggestSettingsException e) { + logger.warn("Failed to add {}", field, e); + } + })); + suggester.createIndexIfNothing(); + } catch (final Exception e) { + logger.warn("Failed to initialize Suggester.", e); + } } public Suggester suggester() { From 08efca08a0668d95eef36315c901b44dabc17f6b Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Sat, 27 Jan 2024 11:12:50 +0900 Subject: [PATCH 16/69] #2792 improve log messages --- src/main/java/org/codelibs/fess/helper/SystemHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java index c6912e083f..64fab26412 100644 --- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java @@ -616,7 +616,7 @@ public void calibrateCpuLoad() { waitingThreadNames.add(threadName); while (current >= percent) { if (logger.isInfoEnabled()) { - logger.info("Cpu Load {}% is greater than {}%. {} threads are waiting.", current, percent, waitingThreadNames.size()); + logger.info("Cpu Load {}% is greater than {}%. {} waiting thread(s).", current, percent, waitingThreadNames.size()); } if (logger.isDebugEnabled()) { logger.debug("Waiting threads: {}", waitingThreadNames); @@ -633,7 +633,7 @@ public void waitForNoWaitingThreads() { int count = waitingThreadNames.size(); while (count > 0) { if (logger.isInfoEnabled()) { - logger.info("{} threads are waiting.", count); + logger.info("{} waiting thread(s).", count); } ThreadUtil.sleep(systemCpuCheckInterval); count = waitingThreadNames.size(); From b50b0b93f2518072bd52045d6ec874b3ab424582 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Sun, 28 Jan 2024 22:54:26 +0900 Subject: [PATCH 17/69] fix #2801 Updated AccessTokenHelper to throw exception when only 'Bearer' is specified in Authorization header --- .../org/codelibs/fess/helper/AccessTokenHelper.java | 6 ++++-- .../codelibs/fess/helper/AccessTokenHelperTest.java | 12 +++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/codelibs/fess/helper/AccessTokenHelper.java b/src/main/java/org/codelibs/fess/helper/AccessTokenHelper.java index d32148c11e..870df007f6 100644 --- a/src/main/java/org/codelibs/fess/helper/AccessTokenHelper.java +++ b/src/main/java/org/codelibs/fess/helper/AccessTokenHelper.java @@ -27,6 +27,8 @@ public class AccessTokenHelper { + protected static final String BEARER = "Bearer"; + protected Random random = new SecureRandom(); public String generateAccessToken() { @@ -37,10 +39,10 @@ public String getAccessTokenFromRequest(final HttpServletRequest request) { final String token = request.getHeader("Authorization"); if (token != null) { final String[] values = token.trim().split(" "); - if (values.length == 2 && "Bearer".equals(values[0])) { + if (values.length == 2 && BEARER.equals(values[0])) { return values[1]; } - if (values.length == 1) { + if (values.length == 1 && !BEARER.equals(values[0])) { return values[0]; } throw new InvalidAccessTokenException("invalid_request", "Invalid format: " + token); diff --git a/src/test/java/org/codelibs/fess/helper/AccessTokenHelperTest.java b/src/test/java/org/codelibs/fess/helper/AccessTokenHelperTest.java index 1166ffdf5a..2f1c7320dd 100644 --- a/src/test/java/org/codelibs/fess/helper/AccessTokenHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/AccessTokenHelperTest.java @@ -63,16 +63,22 @@ public void test_getAccessTokenFromRequest_ok1() { assertEquals(token, accessTokenHelper.getAccessTokenFromRequest(req)); } - public void test_getAccessTokenFromRequest_ng0() { - final String token = accessTokenHelper.generateAccessToken(); + public void test_getAccessTokenFromRequest_bad0() { MockletHttpServletRequest req = getMockRequest(); assertNull(accessTokenHelper.getAccessTokenFromRequest(req)); } - public void test_getAccessTokenFromRequest_ng1() { + public void test_getAccessTokenFromRequest_bad1() { final String token = "INVALID _TOKEN0"; MockletHttpServletRequest req = getMockRequest(); req.addHeader("Authorization", token); assertThrows(InvalidAccessTokenException.class, () -> accessTokenHelper.getAccessTokenFromRequest(req)); } + + public void test_getAccessTokenFromRequest_bad2() { + final String token = "Bearer"; + MockletHttpServletRequest req = getMockRequest(); + req.addHeader("Authorization", token); + assertThrows(InvalidAccessTokenException.class, () -> accessTokenHelper.getAccessTokenFromRequest(req)); + } } From 0686a8b613c0f107afccb12b6153cc127bc37a3d Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Tue, 30 Jan 2024 22:15:04 +0900 Subject: [PATCH 18/69] fix #2802 Prevent NullPointerException in FessMultipartRequestHandler by adding null check and fallback for tempDirFile --- .../sponsor/FessMultipartRequestHandler.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java index d84d67dc89..6cf5945e31 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java @@ -32,6 +32,7 @@ import org.apache.commons.fileupload2.jakarta.JakartaServletDiskFileUpload; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.util.ComponentUtil; import org.dbflute.helper.message.ExceptionMessageBuilder; import org.lastaflute.core.message.UserMessages; @@ -45,6 +46,7 @@ import org.lastaflute.web.ruts.multipart.exception.MultipartExceededException; import org.lastaflute.web.util.LaServletContextUtil; +import jakarta.servlet.ServletContext; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; @@ -57,7 +59,6 @@ public class FessMultipartRequestHandler implements MultipartRequestHandler { // Definition // ========== private static final Logger logger = LogManager.getLogger(FessMultipartRequestHandler.class); - protected static final String CONTEXT_TEMPDIR_KEY = "jakarta.searvlet.context.tempdir"; protected static final String JAVA_IO_TMPDIR_KEY = "java.io.tmpdir"; // =================================================================================== @@ -326,12 +327,14 @@ protected Integer getSizeThreshold() { } protected String getRepositoryPath() { - final File tempDirFile = (File) LaServletContextUtil.getServletContext().getAttribute(CONTEXT_TEMPDIR_KEY); - String tempDir = tempDirFile.getAbsolutePath(); - if (tempDir == null || tempDir.length() == 0) { - tempDir = System.getProperty(JAVA_IO_TMPDIR_KEY); + final File tempDirFile = (File) LaServletContextUtil.getServletContext().getAttribute(ServletContext.TEMPDIR); + if (tempDirFile != null) { + final String tempDir = tempDirFile.getAbsolutePath(); + if (StringUtil.isNotBlank(tempDir)) { + return tempDir; + } } - return tempDir; + return System.getProperty(JAVA_IO_TMPDIR_KEY); } // =================================================================================== From 479eeab409e207c02914abfe4ef0463cf055a770 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Mon, 5 Feb 2024 22:20:57 +0900 Subject: [PATCH 19/69] fix #2803 Include aside tag in HTML crawler's pruned tags to enhance content relevance. --- .../org/codelibs/fess/mylasta/direction/FessConfig.java | 6 +++--- src/main/resources/fess_config.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 0a55c5b504..228f00b99a 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java @@ -412,7 +412,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** The key of the configuration. e.g. //LINK[@rel='canonical'][1]/@href */ String CRAWLER_DOCUMENT_HTML_CANONICAL_XPATH = "crawler.document.html.canonical.xpath"; - /** The key of the configuration. e.g. noscript,script,style,header,footer,nav,a[rel=nofollow] */ + /** The key of the configuration. e.g. noscript,script,style,header,footer,aside,nav,a[rel=nofollow] */ String CRAWLER_DOCUMENT_HTML_PRUNED_TAGS = "crawler.document.html.pruned.tags"; /** The key of the configuration. e.g. 120 */ @@ -2972,7 +2972,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** * Get the value for the key 'crawler.document.html.pruned.tags'.
- * The value is, e.g. noscript,script,style,header,footer,nav,a[rel=nofollow]
+ * The value is, e.g. noscript,script,style,header,footer,aside,nav,a[rel=nofollow]
* @return The value of found property. (NotNull: if not found, exception but basically no way) */ String getCrawlerDocumentHtmlPrunedTags(); @@ -10916,7 +10916,7 @@ protected java.util.Map prepareGeneratedDefaultMap() { defaultMap.put(FessConfig.CRAWLER_DOCUMENT_HTML_LANG_XPATH, "//HTML/@lang"); defaultMap.put(FessConfig.CRAWLER_DOCUMENT_HTML_DIGEST_XPATH, "//META[@name='description']/@content"); defaultMap.put(FessConfig.CRAWLER_DOCUMENT_HTML_CANONICAL_XPATH, "//LINK[@rel='canonical'][1]/@href"); - defaultMap.put(FessConfig.CRAWLER_DOCUMENT_HTML_PRUNED_TAGS, "noscript,script,style,header,footer,nav,a[rel=nofollow]"); + defaultMap.put(FessConfig.CRAWLER_DOCUMENT_HTML_PRUNED_TAGS, "noscript,script,style,header,footer,aside,nav,a[rel=nofollow]"); defaultMap.put(FessConfig.CRAWLER_DOCUMENT_HTML_MAX_DIGEST_LENGTH, "120"); defaultMap.put(FessConfig.CRAWLER_DOCUMENT_HTML_DEFAULT_LANG, ""); defaultMap.put(FessConfig.CRAWLER_DOCUMENT_HTML_DEFAULT_INCLUDE_INDEX_PATTERNS, ""); diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties index f3f35aca06..20660ad73d 100644 --- a/src/main/resources/fess_config.properties +++ b/src/main/resources/fess_config.properties @@ -239,7 +239,7 @@ crawler.document.html.content.xpath=//BODY crawler.document.html.lang.xpath=//HTML/@lang crawler.document.html.digest.xpath=//META[@name='description']/@content crawler.document.html.canonical.xpath=//LINK[@rel='canonical'][1]/@href -crawler.document.html.pruned.tags=noscript,script,style,header,footer,nav,a[rel=nofollow] +crawler.document.html.pruned.tags=noscript,script,style,header,footer,aside,nav,a[rel=nofollow] crawler.document.html.max.digest.length=120 crawler.document.html.default.lang= crawler.document.html.default.include.index.patterns= From f1894f70e1620889b18feb79eab4c2d374bfde0e Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 8 Feb 2024 14:03:19 +0900 Subject: [PATCH 20/69] fix #2804 Disable OSDD processing when SSO is active to enhance usability --- .../java/org/codelibs/fess/Constants.java | 6 + .../org/codelibs/fess/helper/OsddHelper.java | 51 ++++-- .../fess/mylasta/direction/FessConfig.java | 17 +- .../fess/mylasta/direction/FessProp.java | 4 + .../org/codelibs/fess/sso/SsoManager.java | 9 +- src/main/resources/fess_config.properties | 2 +- .../codelibs/fess/helper/OsddHelperTest.java | 169 ++++++++++++++++++ 7 files changed, 224 insertions(+), 34 deletions(-) create mode 100644 src/test/java/org/codelibs/fess/helper/OsddHelperTest.java diff --git a/src/main/java/org/codelibs/fess/Constants.java b/src/main/java/org/codelibs/fess/Constants.java index e3bce22b28..06ea8c475e 100644 --- a/src/main/java/org/codelibs/fess/Constants.java +++ b/src/main/java/org/codelibs/fess/Constants.java @@ -53,6 +53,10 @@ public class Constants extends CoreLibConstants { public static final String STOP = "stop"; + public static final String AUTO = "auto"; + + public static final String NONE = "none"; + public static final String ITEM_LABEL = "label"; public static final String ITEM_VALUE = "value"; @@ -158,6 +162,8 @@ public class Constants extends CoreLibConstants { public static final String LTR_WINDOW_SIZE_PROPERTY = "ltr.window.size"; + public static final String SSO_TYPE_PROPERTY = "sso.type"; + public static final String REQUEST_QUERIES = "fess.Queries"; public static final String HIGHLIGHT_QUERIES = "fess.HighlightQueries"; diff --git a/src/main/java/org/codelibs/fess/helper/OsddHelper.java b/src/main/java/org/codelibs/fess/helper/OsddHelper.java index 90ca1b3e72..4f21495a95 100644 --- a/src/main/java/org/codelibs/fess/helper/OsddHelper.java +++ b/src/main/java/org/codelibs/fess/helper/OsddHelper.java @@ -23,6 +23,7 @@ import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; +import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.util.ComponentUtil; import org.lastaflute.web.response.StreamResponse; import org.lastaflute.web.util.LaServletContextUtil; @@ -51,20 +52,44 @@ public void init() { if (logger.isDebugEnabled()) { logger.debug("Initialize {}", this.getClass().getSimpleName()); } - if (Constants.TRUE.equalsIgnoreCase(ComponentUtil.getFessConfig().getOsddLinkEnabled())) { - if (StringUtil.isNotBlank(osddPath)) { - final String path = LaServletContextUtil.getServletContext().getRealPath(osddPath); - osddFile = new File(path); - if (!osddFile.isFile()) { - osddFile = null; - logger.warn("{} was not found.", path); - } - } else { - logger.info("OSDD file is not found."); - } - } else { + osddFile = getOsddFile(); + } + + protected File getOsddFile() { + if (!isOsddLinkEnabled()) { logger.debug("OSDD is disabled."); + return null; + } + if (StringUtil.isBlank(osddPath)) { + logger.info("OSDD file is not found."); + return null; + } + final String path = LaServletContextUtil.getServletContext().getRealPath(osddPath); + if (path == null) { + logger.warn("{} was not found.", path); + return null; + } + final File osddFile = new File(path); + if (!osddFile.isFile()) { + logger.warn("{} was not a file.", path); + return null; } + return osddFile; + } + + protected boolean isOsddLinkEnabled() { + final FessConfig fessConfig = ComponentUtil.getFessConfig(); + final String osddLinkEnabled = fessConfig.getOsddLinkEnabled(); + if (Constants.TRUE.equalsIgnoreCase(osddLinkEnabled)) { + return true; + } + + if (!Constants.AUTO.equalsIgnoreCase(osddLinkEnabled)) { + return false; + } + + final String ssoType = fessConfig.getSsoType(); + return StringUtil.isBlank(ssoType) || Constants.NONE.equalsIgnoreCase(ssoType); } public boolean hasOpenSearchFile() { @@ -73,7 +98,7 @@ public boolean hasOpenSearchFile() { public StreamResponse asStream() { if (osddFile == null) { - throw ComponentUtil.getResponseManager().new404("Unsupported OpenSearch response."); + throw ComponentUtil.getResponseManager().new404("Unsupported Open Search Description Document response."); } return new StreamResponse(osddFile.getName()).contentType(contentType + "; charset=" + encoding).stream(out -> { 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 228f00b99a..1785c37a1a 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java @@ -1194,7 +1194,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** The key of the configuration. e.g. __TEMPLATE__ */ String FORM_ADMIN_DEFAULT_TEMPLATE_NAME = "form.admin.default.template.name"; - /** The key of the configuration. e.g. true */ + /** The key of the configuration. e.g. auto */ String OSDD_LINK_ENABLED = "osdd.link.enabled"; /** The key of the configuration. e.g. true */ @@ -5569,18 +5569,11 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** * Get the value for the key 'osdd.link.enabled'.
- * The value is, e.g. true
+ * The value is, e.g. auto
* @return The value of found property. (NotNull: if not found, exception but basically no way) */ String getOsddLinkEnabled(); - /** - * Is the property for the key 'osdd.link.enabled' true?
- * The value is, e.g. true
- * @return The determination, true or false. (if not found, exception but basically no way) - */ - boolean isOsddLinkEnabled(); - /** * Get the value for the key 'clipboard.copy.icon.enabled'.
* The value is, e.g. true
@@ -9640,10 +9633,6 @@ public String getOsddLinkEnabled() { return get(FessConfig.OSDD_LINK_ENABLED); } - public boolean isOsddLinkEnabled() { - return is(FessConfig.OSDD_LINK_ENABLED); - } - public String getClipboardCopyIconEnabled() { return get(FessConfig.CLIPBOARD_COPY_ICON_ENABLED); } @@ -11147,7 +11136,7 @@ protected java.util.Map prepareGeneratedDefaultMap() { defaultMap.put(FessConfig.FORM_ADMIN_MAX_INPUT_SIZE, "10000"); defaultMap.put(FessConfig.FORM_ADMIN_LABEL_IN_CONFIG_ENABLED, "false"); defaultMap.put(FessConfig.FORM_ADMIN_DEFAULT_TEMPLATE_NAME, "__TEMPLATE__"); - defaultMap.put(FessConfig.OSDD_LINK_ENABLED, "true"); + defaultMap.put(FessConfig.OSDD_LINK_ENABLED, "auto"); defaultMap.put(FessConfig.CLIPBOARD_COPY_ICON_ENABLED, "true"); defaultMap.put(FessConfig.AUTHENTICATION_ADMIN_USERS, "admin"); defaultMap.put(FessConfig.AUTHENTICATION_ADMIN_ROLES, "admin"); 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 4ccf474291..bf6fea82a6 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java @@ -723,6 +723,10 @@ default boolean isAzureAdUseDomainServices() { return Constants.TRUE.equalsIgnoreCase(getSystemProperty("aad.use.ds", "true")); } + default String getSsoType() { + return getSystemProperty(Constants.SSO_TYPE_PROPERTY, Constants.NONE); + } + // // fess_*.properties // diff --git a/src/main/java/org/codelibs/fess/sso/SsoManager.java b/src/main/java/org/codelibs/fess/sso/SsoManager.java index cd87d19f46..364b86b55b 100644 --- a/src/main/java/org/codelibs/fess/sso/SsoManager.java +++ b/src/main/java/org/codelibs/fess/sso/SsoManager.java @@ -20,6 +20,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.codelibs.fess.Constants; import org.codelibs.fess.mylasta.action.FessUserBean; import org.codelibs.fess.util.ComponentUtil; import org.lastaflute.web.login.credential.LoginCredential; @@ -28,10 +29,6 @@ public class SsoManager { private static final Logger logger = LogManager.getLogger(SsoManager.class); - protected static final String SSO_TYPE = "sso.type"; - - protected static final String NONE = "none"; - protected final List authenticatorList = new ArrayList<>(); public boolean available() { @@ -39,7 +36,7 @@ public boolean available() { if (logger.isDebugEnabled()) { logger.debug("sso.type: {}", ssoType); } - return !NONE.equals(ssoType); + return !Constants.NONE.equals(ssoType); } public LoginCredential getLoginCredential() { @@ -81,7 +78,7 @@ protected SsoAuthenticator getAuthenticator() { } protected String getSsoType() { - return ComponentUtil.getFessConfig().getSystemProperty(SSO_TYPE, NONE); + return ComponentUtil.getFessConfig().getSsoType(); } public SsoAuthenticator[] getAuthenticators() { diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties index 20660ad73d..becd3c521e 100644 --- a/src/main/resources/fess_config.properties +++ b/src/main/resources/fess_config.properties @@ -633,7 +633,7 @@ logging.app.packages=org.codelibs,org.dbflute,org.lastaflute form.admin.max.input.size=10000 form.admin.label.in.config.enabled=false form.admin.default.template.name=__TEMPLATE__ -osdd.link.enabled=true +osdd.link.enabled=auto clipboard.copy.icon.enabled=true # ---------------------------------------------------------- diff --git a/src/test/java/org/codelibs/fess/helper/OsddHelperTest.java b/src/test/java/org/codelibs/fess/helper/OsddHelperTest.java new file mode 100644 index 0000000000..1bd7e343d1 --- /dev/null +++ b/src/test/java/org/codelibs/fess/helper/OsddHelperTest.java @@ -0,0 +1,169 @@ +/* + * Copyright 2012-2023 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.helper; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.codelibs.core.io.InputStreamUtil; +import org.codelibs.fess.Constants; +import org.codelibs.fess.mylasta.direction.FessConfig; +import org.codelibs.fess.unit.UnitFessTestCase; +import org.codelibs.fess.util.ComponentUtil; +import org.lastaflute.web.response.StreamResponse; +import org.lastaflute.web.servlet.request.stream.WrittenStreamOut; + +public class OsddHelperTest extends UnitFessTestCase { + + public void test_init_nofile() { + ComponentUtil.setFessConfig(new FessConfig.SimpleImpl() { + @Override + public String getOsddLinkEnabled() { + return "auto"; + } + + @Override + public String getSsoType() { + return "none"; + } + }); + final OsddHelper osddHelper = new OsddHelper(); + osddHelper.setContentType("application/opensearchdescription+xml"); + osddHelper.init(); + assertFalse(osddHelper.hasOpenSearchFile()); + + try { + osddHelper.asStream(); + fail(); + } catch (final Exception e) { + assertEquals("Unsupported Open Search Description Document response.", e.getMessage()); + } + } + + public void test_init_osddpath() throws IOException { + ComponentUtil.setFessConfig(new FessConfig.SimpleImpl() { + @Override + public String getOsddLinkEnabled() { + return "auto"; + } + + @Override + public String getSsoType() { + return "none"; + } + }); + final OsddHelper osddHelper = new OsddHelper(); + osddHelper.setOsddPath("osdd/osdd.xml"); + osddHelper.setEncoding(Constants.UTF_8); + osddHelper.init(); + assertTrue(osddHelper.hasOpenSearchFile()); + + final StreamResponse streamResponse = osddHelper.asStream(); + assertEquals("text/xml; charset=UTF-8", streamResponse.getContentType()); + streamResponse.getStreamCall().callback(new WrittenStreamOut() { + + @Override + public void write(final InputStream ins) throws IOException { + assertEquals(""" + + + Fess + Full Text Search for Your Documents. + Full Text Search + fess-user@lists.sourceforge.jp + http://localhost:8080/fess/ + + UTF-8 + UTF-8 + + """, new String(InputStreamUtil.getBytes(ins))); + } + + @Override + public OutputStream stream() { + return null; + } + }); + } + + public void test_init_osddpath_null() { + ComponentUtil.setFessConfig(new FessConfig.SimpleImpl() { + @Override + public String getOsddLinkEnabled() { + return "auto"; + } + + @Override + public String getSsoType() { + return "none"; + } + }); + final OsddHelper osddHelper = new OsddHelper(); + osddHelper.setOsddPath("osdd/none.xml"); + osddHelper.init(); + assertFalse(osddHelper.hasOpenSearchFile()); + } + + public void test_init_disabled() { + ComponentUtil.setFessConfig(new FessConfig.SimpleImpl() { + @Override + public String getOsddLinkEnabled() { + return "false"; + } + }); + final OsddHelper osddHelper = new OsddHelper(); + osddHelper.setOsddPath("osdd/osdd.xml"); + osddHelper.init(); + assertFalse(osddHelper.hasOpenSearchFile()); + } + + public void test_init_saml() { + ComponentUtil.setFessConfig(new FessConfig.SimpleImpl() { + @Override + public String getOsddLinkEnabled() { + return "auto"; + } + + @Override + public String getSsoType() { + return "saml"; + } + }); + final OsddHelper osddHelper = new OsddHelper(); + osddHelper.setOsddPath("osdd/osdd.xml"); + osddHelper.init(); + assertFalse(osddHelper.hasOpenSearchFile()); + } + + public void test_init_force() throws IOException { + ComponentUtil.setFessConfig(new FessConfig.SimpleImpl() { + @Override + public String getOsddLinkEnabled() { + return "true"; + } + + @Override + public String getSsoType() { + return "saml"; + } + }); + final OsddHelper osddHelper = new OsddHelper(); + osddHelper.setOsddPath("osdd/osdd.xml"); + osddHelper.init(); + assertTrue(osddHelper.hasOpenSearchFile()); + } +} From f8eda0df53e85ed5cb1ecee007f2d4f8ea5ee08b Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 8 Feb 2024 14:17:08 +0900 Subject: [PATCH 21/69] #2804 add osdd.xml for testingl --- src/test/resources/osdd/osdd.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/test/resources/osdd/osdd.xml diff --git a/src/test/resources/osdd/osdd.xml b/src/test/resources/osdd/osdd.xml new file mode 100644 index 0000000000..6e89c60e00 --- /dev/null +++ b/src/test/resources/osdd/osdd.xml @@ -0,0 +1,11 @@ + + + Fess + Full Text Search for Your Documents. + Full Text Search + fess-user@lists.sourceforge.jp + http://localhost:8080/fess/ + + UTF-8 + UTF-8 + From 03f32cb3c3de0a3c140ed192160f489748f4fdaa Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 8 Feb 2024 22:36:12 +0900 Subject: [PATCH 22/69] #2789 fess-script-groovy 15.0.0-SNAPSHOT --- deps.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deps.xml b/deps.xml index a6ac5808f8..f4be4366a6 100644 --- a/deps.xml +++ b/deps.xml @@ -45,11 +45,11 @@ - + - - + + From 8e215f4cbdb402b009550e56040b05e732019196 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Sat, 10 Feb 2024 12:19:37 +0900 Subject: [PATCH 23/69] Refactor GitHub Actions for Improved Efficiency and Maintenance (#2805) --- .github/workflows/codeql-analysis.yml | 50 +++++---------------------- .github/workflows/maven.yml | 10 +++--- src/test/resources/before_script.sh | 48 +++++++++++++++---------- src/test/resources/run.sh | 5 +-- 4 files changed, 45 insertions(+), 68 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index cbf0c35e1a..c13c36e5b1 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,8 +1,3 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. name: "CodeQL" on: @@ -16,73 +11,44 @@ on: - "*.x" schedule: - cron: '36 4 * * 2' + workflow_dispatch: jobs: analyze: name: Analyze runs-on: ubuntu-latest + timeout-minutes: 20 strategy: fail-fast: false matrix: - # Override automatic language detection by changing the below list - # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python'] language: ['java', 'javascript'] - # Learn more... - # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: - # We must fetch at least the immediate parents so that if this is - # a pull request then we can checkout the head. fetch-depth: 2 - # If this run was triggered by a pull request event, then checkout - # the head of the pull request instead of the merge commit. - - run: git checkout HEAD^2 - if: ${{ github.event_name == 'pull_request' }} - - # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v1 with: languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - #- name: Autobuild - # uses: github/codeql-action/autobuild@v1 - - # ℹ️ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release - - uses: actions/checkout@v2 - name: Set up JDK 21 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: '21' distribution: 'temurin' - name: Cache Maven packages - uses: actions/cache@v2 + uses: actions/cache@v4 with: - path: ~/.m2 + path: ~/.m2/repository key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Build with Maven run: mvn -B package --file pom.xml - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v3 + diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index e5dc3f778e..5b0c5eb250 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -12,20 +12,20 @@ on: branches: - master - "*.x" + workflow_dispatch: jobs: build: - runs-on: ubuntu-latest - + timeout-minutes: 15 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 21 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: '21' distribution: 'temurin' - - uses: actions/cache@v1 + - uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/src/test/resources/before_script.sh b/src/test/resources/before_script.sh index 432788fe0b..019fb4649f 100644 --- a/src/test/resources/before_script.sh +++ b/src/test/resources/before_script.sh @@ -1,26 +1,36 @@ #!/bin/bash +set -xuo pipefail -TMP_FILE=/tmp/fess-build.$$ -unzip target/releases/fess-*.zip 2>&1 > $TMP_FILE -tail $TMP_FILE +temp_log_file=/tmp/fess-build.$$ +unzip target/releases/fess-*.zip > ${temp_log_file} 2>&1 +tail ${temp_log_file} -./fess-*/bin/fess 2>&1 > $TMP_FILE & +./fess-*/bin/fess > ${temp_log_file} 2>&1 & -pushd /tmp -git clone https://github.com/codelibs/fess-testdata.git -popd - -tail $TMP_FILE -touch `ls -d ./fess-*/logs`/fess-crawler.log -tail -f ./fess-*/logs/*.log & - -counter=0 -ret=1 -while [ $ret != 0 -a $counter != 180 ] ; do - echo "Ping Fess... $counter" - curl -v "localhost:8080/json/?type=ping" - ret=$? +temp_json_file=/tmp/fess-log.$$ +touch ${temp_json_file} +error_count=0 +while true ; do + status=$(curl -w '%{http_code}\n' -s -o ${temp_json_file} "http://localhost:8080/api/v1/health") + cat ${temp_json_file} + if [[ x"${status}" = x200 ]] ; then + break + else + error_count=$((error_count + 1)) + fi + if [[ ${error_count} -ge 60 ]] ; then + echo "Fess is not available." + cat ${temp_log_file} ./fess-*/logs/*.log + exit 1 + fi sleep 1 - counter=$((counter + 1)) done +pushd /tmp >/dev/null +git clone https://github.com/codelibs/fess-testdata.git +popd >/dev/null + +cat ${temp_log_file} ./fess-*/logs/*.log +curl -s "http://localhost:9201/_cat/indices?v" +curl -s "http://localhost:8080/" + diff --git a/src/test/resources/run.sh b/src/test/resources/run.sh index ea131a71f8..ab2b053e41 100644 --- a/src/test/resources/run.sh +++ b/src/test/resources/run.sh @@ -1,8 +1,9 @@ #!/bin/bash -tail -f ./fess-*/logs/fess-crawler.log & +touch $(ls -d ./fess-*/logs)/fess-crawler.log +tail -f ./fess-*/logs/*.log & -mvn test -P integrationTests -Dtest.fess.url="http://127.0.0.1:8080" -Dtest.search_engine.url="http://127.0.0.1:9201" +mvn test -P integrationTests -Dtest.fess.url="http://localhost:8080" -Dtest.search_engine.url="http://localhost:9201" ret=$? if [ $ret != 0 ] ; then From 106900ae91eb1b71ae519292844d97442577f02b Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Sat, 10 Feb 2024 20:19:11 +0900 Subject: [PATCH 24/69] Update Test Environment to macOS-14 and Enhance Logging During Test Execution (#2806) * add log4j2.xml * replace with macos-14 --- .github/workflows/maven.yml | 2 +- .../java/org/codelibs/fess/it/CrudTestBase.java | 9 ++++++++- .../codelibs/fess/util/GsaConfigParserTest.java | 8 ++++++-- src/test/resources/log4j2.xml | 15 +++++++++++++++ 4 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 src/test/resources/log4j2.xml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 5b0c5eb250..1887704c6d 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -16,7 +16,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: macos-14 timeout-minutes: 15 steps: - uses: actions/checkout@v4 diff --git a/src/test/java/org/codelibs/fess/it/CrudTestBase.java b/src/test/java/org/codelibs/fess/it/CrudTestBase.java index b800c484a5..01d0e827ef 100644 --- a/src/test/java/org/codelibs/fess/it/CrudTestBase.java +++ b/src/test/java/org/codelibs/fess/it/CrudTestBase.java @@ -101,6 +101,7 @@ protected static void tearDownAll() { // Bodies // ================ protected void testCreate() { + logger.info("[BEGIN] testCreate"); // Test: create setting api. for (int i = 0; i < NUM; i++) { final Map requestBody = createTestParam(i); @@ -114,9 +115,11 @@ protected void testCreate() { // Test: number of settings. final Map searchBody = createSearchBody(SEARCH_ALL_NUM); checkGetMethod(searchBody, getListEndpointSuffix()).then().body(getJsonPath() + ".size()", equalTo(NUM)); + logger.info("[END] testCreate"); } protected void testRead() { + logger.info("[BEGIN] testRead"); // Test: get settings api. final Map searchBody = createSearchBody(SEARCH_ALL_NUM); List nameList = getPropList(searchBody, getKeyProperty()); @@ -141,10 +144,11 @@ protected void testRead() { searchBody.put("page", i + 1); checkGetMethod(searchBody, getListEndpointSuffix()).then().body("response." + getListEndpointSuffix() + ".size()", equalTo(1)); } - + logger.info("[END] testRead"); } protected void testUpdate() { + logger.info("[BEGIN] testUpdate"); // Test: update settings api final Set keySet = createTestParam(0).keySet(); final Map updateMap = getUpdateMap(); @@ -169,6 +173,7 @@ protected void testUpdate() { } checkUpdate(); + logger.info("[END] testUpdate"); } protected void checkUpdate() { @@ -184,6 +189,7 @@ protected void checkUpdate() { } protected void testDelete() { + logger.info("[BEGIN] testDelete"); final Map searchBody = createSearchBody(SEARCH_ALL_NUM); for (int count = 0; count < NUM; count++) { @@ -194,6 +200,7 @@ protected void testDelete() { // Test: number of settings. checkGetMethod(searchBody, getListEndpointSuffix()).then().body(getJsonPath() + ".size()", equalTo(0)); + logger.info("[END] testDelete"); } // ================ diff --git a/src/test/java/org/codelibs/fess/util/GsaConfigParserTest.java b/src/test/java/org/codelibs/fess/util/GsaConfigParserTest.java index 2711fbc955..491c15c23a 100644 --- a/src/test/java/org/codelibs/fess/util/GsaConfigParserTest.java +++ b/src/test/java/org/codelibs/fess/util/GsaConfigParserTest.java @@ -18,6 +18,8 @@ import java.io.IOException; import java.io.InputStream; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codelibs.core.io.ResourceUtil; import org.codelibs.fess.es.config.exentity.LabelType; import org.codelibs.fess.helper.SystemHelper; @@ -26,6 +28,8 @@ public class GsaConfigParserTest extends UnitFessTestCase { + private static final Logger logger = LogManager.getLogger(GsaConfigParserTest.class); + @Override public void setUp() throws Exception { super.setUp(); @@ -38,10 +42,10 @@ public void test_parse() throws IOException { parser.parse(new InputSource(is)); } parser.getWebConfig().ifPresent(c -> { - System.out.println(c.toString()); + logger.debug(c.toString()); }).orElse(() -> fail()); parser.getFileConfig().ifPresent(c -> { - System.out.println(c.toString()); + logger.debug(c.toString()); }).orElse(() -> fail()); LabelType[] labelTypes = parser.getLabelTypes(); assertEquals(3, labelTypes.length); diff --git a/src/test/resources/log4j2.xml b/src/test/resources/log4j2.xml new file mode 100644 index 0000000000..6f2b3bdef2 --- /dev/null +++ b/src/test/resources/log4j2.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + From b774b68242cbc8b900e1113e11c610b2001b11ff Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 22 Feb 2024 10:28:15 +0900 Subject: [PATCH 25/69] opensearch 2.12.0 --- module.xml | 2 +- plugin.xml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/module.xml b/module.xml index c8a41d9d81..75b9fc1bfa 100644 --- a/module.xml +++ b/module.xml @@ -6,7 +6,7 @@ - + diff --git a/plugin.xml b/plugin.xml index 8f5d01de38..3ac6e39866 100644 --- a/plugin.xml +++ b/plugin.xml @@ -17,8 +17,8 @@ - - + + @@ -26,8 +26,8 @@ - - + + @@ -35,8 +35,8 @@ - - + + @@ -44,8 +44,8 @@ - - + + From 76352cf8dce73c4cc9049085237ebd6ad1c98996 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 22 Feb 2024 10:53:18 +0900 Subject: [PATCH 26/69] Update copyright headers to 2024 --- src/main/java/org/codelibs/fess/Constants.java | 2 +- src/main/java/org/codelibs/fess/FessBoot.java | 2 +- src/main/java/org/codelibs/fess/annotation/Secured.java | 2 +- src/main/java/org/codelibs/fess/api/BaseApiManager.java | 2 +- src/main/java/org/codelibs/fess/api/WebApiManager.java | 2 +- src/main/java/org/codelibs/fess/api/WebApiManagerFactory.java | 2 +- src/main/java/org/codelibs/fess/api/WebApiRequest.java | 2 +- src/main/java/org/codelibs/fess/api/WebApiResponse.java | 2 +- .../org/codelibs/fess/api/engine/SearchEngineApiManager.java | 2 +- src/main/java/org/codelibs/fess/api/json/SearchApiManager.java | 2 +- src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java | 2 +- src/main/java/org/codelibs/fess/app/job/ScriptExecutorJob.java | 2 +- .../java/org/codelibs/fess/app/logic/AccessContextLogic.java | 2 +- src/main/java/org/codelibs/fess/app/pager/AccessTokenPager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/BadWordPager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/BoostDocPager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/CharMappingPager.java | 2 +- .../java/org/codelibs/fess/app/pager/CrawlingInfoPager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/DataConfigPager.java | 2 +- .../java/org/codelibs/fess/app/pager/DuplicateHostPager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/ElevateWordPager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/FailureUrlPager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/FileAuthPager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/FileConfigPager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/GroupPager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/JobLogPager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/KeyMatchPager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/KuromojiPager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/LabelTypePager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/PathMapPager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/ProtwordsPager.java | 2 +- .../java/org/codelibs/fess/app/pager/RelatedContentPager.java | 2 +- .../java/org/codelibs/fess/app/pager/RelatedQueryPager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/ReqHeaderPager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/RolePager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/RoleTypePager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/SchedulerPager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/SearchLogPager.java | 2 +- .../java/org/codelibs/fess/app/pager/StemmerOverridePager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/StopwordsPager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/SynonymPager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/UserPager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/WebAuthPager.java | 2 +- src/main/java/org/codelibs/fess/app/pager/WebConfigPager.java | 2 +- .../java/org/codelibs/fess/app/service/AccessTokenService.java | 2 +- src/main/java/org/codelibs/fess/app/service/BadWordService.java | 2 +- .../org/codelibs/fess/app/service/BoostDocumentRuleService.java | 2 +- .../java/org/codelibs/fess/app/service/CharMappingService.java | 2 +- .../java/org/codelibs/fess/app/service/CrawlingInfoService.java | 2 +- .../java/org/codelibs/fess/app/service/DataConfigService.java | 2 +- .../org/codelibs/fess/app/service/DuplicateHostService.java | 2 +- .../java/org/codelibs/fess/app/service/ElevateWordService.java | 2 +- .../java/org/codelibs/fess/app/service/FailureUrlService.java | 2 +- .../java/org/codelibs/fess/app/service/FavoriteLogService.java | 2 +- src/main/java/org/codelibs/fess/app/service/FessAppService.java | 2 +- .../codelibs/fess/app/service/FileAuthenticationService.java | 2 +- .../java/org/codelibs/fess/app/service/FileConfigService.java | 2 +- src/main/java/org/codelibs/fess/app/service/GroupService.java | 2 +- src/main/java/org/codelibs/fess/app/service/JobLogService.java | 2 +- .../java/org/codelibs/fess/app/service/KeyMatchService.java | 2 +- .../java/org/codelibs/fess/app/service/KuromojiService.java | 2 +- .../java/org/codelibs/fess/app/service/LabelTypeService.java | 2 +- .../java/org/codelibs/fess/app/service/PathMappingService.java | 2 +- .../java/org/codelibs/fess/app/service/ProtwordsService.java | 2 +- .../org/codelibs/fess/app/service/RelatedContentService.java | 2 +- .../java/org/codelibs/fess/app/service/RelatedQueryService.java | 2 +- .../org/codelibs/fess/app/service/RequestHeaderService.java | 2 +- src/main/java/org/codelibs/fess/app/service/RoleService.java | 2 +- .../java/org/codelibs/fess/app/service/RoleTypeService.java | 2 +- .../java/org/codelibs/fess/app/service/ScheduledJobService.java | 2 +- .../java/org/codelibs/fess/app/service/SearchLogService.java | 2 +- .../org/codelibs/fess/app/service/StemmerOverrideService.java | 2 +- .../java/org/codelibs/fess/app/service/StopwordsService.java | 2 +- src/main/java/org/codelibs/fess/app/service/SynonymService.java | 2 +- .../java/org/codelibs/fess/app/service/UserInfoService.java | 2 +- src/main/java/org/codelibs/fess/app/service/UserService.java | 2 +- .../org/codelibs/fess/app/service/WebAuthenticationService.java | 2 +- .../java/org/codelibs/fess/app/service/WebConfigService.java | 2 +- src/main/java/org/codelibs/fess/app/web/CrudMode.java | 2 +- src/main/java/org/codelibs/fess/app/web/RootAction.java | 2 +- src/main/java/org/codelibs/fess/app/web/admin/AdminAction.java | 2 +- .../fess/app/web/admin/accesstoken/AdminAccesstokenAction.java | 2 +- .../org/codelibs/fess/app/web/admin/accesstoken/CreateForm.java | 2 +- .../org/codelibs/fess/app/web/admin/accesstoken/EditForm.java | 2 +- .../org/codelibs/fess/app/web/admin/accesstoken/SearchForm.java | 2 +- .../codelibs/fess/app/web/admin/backup/AdminBackupAction.java | 2 +- .../java/org/codelibs/fess/app/web/admin/backup/UploadForm.java | 2 +- .../codelibs/fess/app/web/admin/badword/AdminBadwordAction.java | 2 +- .../org/codelibs/fess/app/web/admin/badword/CreateForm.java | 2 +- .../org/codelibs/fess/app/web/admin/badword/DownloadForm.java | 2 +- .../java/org/codelibs/fess/app/web/admin/badword/EditForm.java | 2 +- .../org/codelibs/fess/app/web/admin/badword/SearchForm.java | 2 +- .../org/codelibs/fess/app/web/admin/badword/UploadForm.java | 2 +- .../fess/app/web/admin/boostdoc/AdminBoostdocAction.java | 2 +- .../org/codelibs/fess/app/web/admin/boostdoc/CreateForm.java | 2 +- .../java/org/codelibs/fess/app/web/admin/boostdoc/EditForm.java | 2 +- .../org/codelibs/fess/app/web/admin/boostdoc/SearchForm.java | 2 +- .../app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java | 2 +- .../org/codelibs/fess/app/web/admin/crawlinginfo/EditForm.java | 2 +- .../codelibs/fess/app/web/admin/crawlinginfo/SearchForm.java | 2 +- .../fess/app/web/admin/dashboard/AdminDashboardAction.java | 2 +- .../fess/app/web/admin/dataconfig/AdminDataconfigAction.java | 2 +- .../org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java | 2 +- .../org/codelibs/fess/app/web/admin/dataconfig/EditForm.java | 2 +- .../org/codelibs/fess/app/web/admin/dataconfig/SearchForm.java | 2 +- .../codelibs/fess/app/web/admin/design/AdminDesignAction.java | 2 +- .../java/org/codelibs/fess/app/web/admin/design/DesignForm.java | 2 +- .../java/org/codelibs/fess/app/web/admin/design/EditForm.java | 2 +- .../org/codelibs/fess/app/web/admin/design/FileAccessForm.java | 2 +- .../java/org/codelibs/fess/app/web/admin/design/UploadForm.java | 2 +- .../org/codelibs/fess/app/web/admin/dict/AdminDictAction.java | 2 +- .../java/org/codelibs/fess/app/web/admin/dict/ListForm.java | 2 +- .../app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java | 2 +- .../codelibs/fess/app/web/admin/dict/kuromoji/CreateForm.java | 2 +- .../codelibs/fess/app/web/admin/dict/kuromoji/DownloadForm.java | 2 +- .../org/codelibs/fess/app/web/admin/dict/kuromoji/EditForm.java | 2 +- .../codelibs/fess/app/web/admin/dict/kuromoji/SearchForm.java | 2 +- .../codelibs/fess/app/web/admin/dict/kuromoji/UploadForm.java | 2 +- .../fess/app/web/admin/dict/mapping/AdminDictMappingAction.java | 2 +- .../codelibs/fess/app/web/admin/dict/mapping/CreateForm.java | 2 +- .../codelibs/fess/app/web/admin/dict/mapping/DownloadForm.java | 2 +- .../org/codelibs/fess/app/web/admin/dict/mapping/EditForm.java | 2 +- .../codelibs/fess/app/web/admin/dict/mapping/SearchForm.java | 2 +- .../codelibs/fess/app/web/admin/dict/mapping/UploadForm.java | 2 +- .../app/web/admin/dict/protwords/AdminDictProtwordsAction.java | 2 +- .../codelibs/fess/app/web/admin/dict/protwords/CreateForm.java | 2 +- .../fess/app/web/admin/dict/protwords/DownloadForm.java | 2 +- .../codelibs/fess/app/web/admin/dict/protwords/EditForm.java | 2 +- .../codelibs/fess/app/web/admin/dict/protwords/SearchForm.java | 2 +- .../codelibs/fess/app/web/admin/dict/protwords/UploadForm.java | 2 +- .../dict/stemmeroverride/AdminDictStemmeroverrideAction.java | 2 +- .../fess/app/web/admin/dict/stemmeroverride/CreateForm.java | 2 +- .../fess/app/web/admin/dict/stemmeroverride/DownloadForm.java | 2 +- .../fess/app/web/admin/dict/stemmeroverride/EditForm.java | 2 +- .../fess/app/web/admin/dict/stemmeroverride/SearchForm.java | 2 +- .../fess/app/web/admin/dict/stemmeroverride/UploadForm.java | 2 +- .../app/web/admin/dict/stopwords/AdminDictStopwordsAction.java | 2 +- .../codelibs/fess/app/web/admin/dict/stopwords/CreateForm.java | 2 +- .../fess/app/web/admin/dict/stopwords/DownloadForm.java | 2 +- .../codelibs/fess/app/web/admin/dict/stopwords/EditForm.java | 2 +- .../codelibs/fess/app/web/admin/dict/stopwords/SearchForm.java | 2 +- .../codelibs/fess/app/web/admin/dict/stopwords/UploadForm.java | 2 +- .../fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java | 2 +- .../codelibs/fess/app/web/admin/dict/synonym/CreateForm.java | 2 +- .../codelibs/fess/app/web/admin/dict/synonym/DownloadForm.java | 2 +- .../org/codelibs/fess/app/web/admin/dict/synonym/EditForm.java | 2 +- .../codelibs/fess/app/web/admin/dict/synonym/SearchForm.java | 2 +- .../codelibs/fess/app/web/admin/dict/synonym/UploadForm.java | 2 +- .../app/web/admin/duplicatehost/AdminDuplicatehostAction.java | 2 +- .../codelibs/fess/app/web/admin/duplicatehost/CreateForm.java | 2 +- .../org/codelibs/fess/app/web/admin/duplicatehost/EditForm.java | 2 +- .../codelibs/fess/app/web/admin/duplicatehost/SearchForm.java | 2 +- .../fess/app/web/admin/elevateword/AdminElevatewordAction.java | 2 +- .../org/codelibs/fess/app/web/admin/elevateword/CreateForm.java | 2 +- .../codelibs/fess/app/web/admin/elevateword/DownloadForm.java | 2 +- .../org/codelibs/fess/app/web/admin/elevateword/EditForm.java | 2 +- .../org/codelibs/fess/app/web/admin/elevateword/SearchForm.java | 2 +- .../org/codelibs/fess/app/web/admin/elevateword/UploadForm.java | 2 +- .../org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.java | 2 +- .../java/org/codelibs/fess/app/web/admin/esreq/UploadForm.java | 2 +- .../fess/app/web/admin/failureurl/AdminFailureurlAction.java | 2 +- .../org/codelibs/fess/app/web/admin/failureurl/EditForm.java | 2 +- .../org/codelibs/fess/app/web/admin/failureurl/SearchForm.java | 2 +- .../fess/app/web/admin/fileauth/AdminFileauthAction.java | 2 +- .../org/codelibs/fess/app/web/admin/fileauth/CreateForm.java | 2 +- .../java/org/codelibs/fess/app/web/admin/fileauth/EditForm.java | 2 +- .../org/codelibs/fess/app/web/admin/fileauth/SearchForm.java | 2 +- .../fess/app/web/admin/fileconfig/AdminFileconfigAction.java | 2 +- .../org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java | 2 +- .../org/codelibs/fess/app/web/admin/fileconfig/EditForm.java | 2 +- .../org/codelibs/fess/app/web/admin/fileconfig/SearchForm.java | 2 +- .../codelibs/fess/app/web/admin/general/AdminGeneralAction.java | 2 +- .../java/org/codelibs/fess/app/web/admin/general/EditForm.java | 2 +- .../java/org/codelibs/fess/app/web/admin/general/MailForm.java | 2 +- .../org/codelibs/fess/app/web/admin/group/AdminGroupAction.java | 2 +- .../java/org/codelibs/fess/app/web/admin/group/CreateForm.java | 2 +- .../java/org/codelibs/fess/app/web/admin/group/EditForm.java | 2 +- .../java/org/codelibs/fess/app/web/admin/group/SearchForm.java | 2 +- .../codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java | 2 +- .../java/org/codelibs/fess/app/web/admin/joblog/EditForm.java | 2 +- .../java/org/codelibs/fess/app/web/admin/joblog/SearchForm.java | 2 +- .../fess/app/web/admin/keymatch/AdminKeymatchAction.java | 2 +- .../org/codelibs/fess/app/web/admin/keymatch/CreateForm.java | 2 +- .../java/org/codelibs/fess/app/web/admin/keymatch/EditForm.java | 2 +- .../org/codelibs/fess/app/web/admin/keymatch/SearchForm.java | 2 +- .../fess/app/web/admin/labeltype/AdminLabeltypeAction.java | 2 +- .../org/codelibs/fess/app/web/admin/labeltype/CreateForm.java | 2 +- .../org/codelibs/fess/app/web/admin/labeltype/EditForm.java | 2 +- .../org/codelibs/fess/app/web/admin/labeltype/SearchForm.java | 2 +- .../org/codelibs/fess/app/web/admin/log/AdminLogAction.java | 2 +- .../org/codelibs/fess/app/web/admin/maintenance/ActionForm.java | 2 +- .../fess/app/web/admin/maintenance/AdminMaintenanceAction.java | 2 +- .../codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java | 2 +- .../org/codelibs/fess/app/web/admin/pathmap/CreateForm.java | 2 +- .../java/org/codelibs/fess/app/web/admin/pathmap/EditForm.java | 2 +- .../org/codelibs/fess/app/web/admin/pathmap/SearchForm.java | 2 +- .../codelibs/fess/app/web/admin/plugin/AdminPluginAction.java | 2 +- .../java/org/codelibs/fess/app/web/admin/plugin/DeleteForm.java | 2 +- .../org/codelibs/fess/app/web/admin/plugin/InstallForm.java | 2 +- .../app/web/admin/relatedcontent/AdminRelatedcontentAction.java | 2 +- .../codelibs/fess/app/web/admin/relatedcontent/CreateForm.java | 2 +- .../codelibs/fess/app/web/admin/relatedcontent/EditForm.java | 2 +- .../codelibs/fess/app/web/admin/relatedcontent/SearchForm.java | 2 +- .../app/web/admin/relatedquery/AdminRelatedqueryAction.java | 2 +- .../codelibs/fess/app/web/admin/relatedquery/CreateForm.java | 2 +- .../org/codelibs/fess/app/web/admin/relatedquery/EditForm.java | 2 +- .../codelibs/fess/app/web/admin/relatedquery/SearchForm.java | 2 +- .../fess/app/web/admin/reqheader/AdminReqheaderAction.java | 2 +- .../org/codelibs/fess/app/web/admin/reqheader/CreateForm.java | 2 +- .../org/codelibs/fess/app/web/admin/reqheader/EditForm.java | 2 +- .../org/codelibs/fess/app/web/admin/reqheader/SearchForm.java | 2 +- .../org/codelibs/fess/app/web/admin/role/AdminRoleAction.java | 2 +- .../java/org/codelibs/fess/app/web/admin/role/CreateForm.java | 2 +- .../java/org/codelibs/fess/app/web/admin/role/EditForm.java | 2 +- .../java/org/codelibs/fess/app/web/admin/role/SearchForm.java | 2 +- .../fess/app/web/admin/scheduler/AdminSchedulerAction.java | 2 +- .../org/codelibs/fess/app/web/admin/scheduler/CreateForm.java | 2 +- .../org/codelibs/fess/app/web/admin/scheduler/EditForm.java | 2 +- .../org/codelibs/fess/app/web/admin/scheduler/SearchForm.java | 2 +- .../fess/app/web/admin/searchlist/AdminSearchlistAction.java | 2 +- .../org/codelibs/fess/app/web/admin/searchlist/CreateForm.java | 2 +- .../org/codelibs/fess/app/web/admin/searchlist/DeleteForm.java | 2 +- .../org/codelibs/fess/app/web/admin/searchlist/EditForm.java | 2 +- .../org/codelibs/fess/app/web/admin/searchlist/ListForm.java | 2 +- .../fess/app/web/admin/searchlog/AdminSearchlogAction.java | 2 +- .../org/codelibs/fess/app/web/admin/searchlog/EditForm.java | 2 +- .../org/codelibs/fess/app/web/admin/searchlog/SearchForm.java | 2 +- .../codelibs/fess/app/web/admin/storage/AdminStorageAction.java | 2 +- .../java/org/codelibs/fess/app/web/admin/storage/ItemForm.java | 2 +- .../java/org/codelibs/fess/app/web/admin/storage/TagForm.java | 2 +- .../codelibs/fess/app/web/admin/suggest/AdminSuggestAction.java | 2 +- .../org/codelibs/fess/app/web/admin/suggest/SuggestForm.java | 2 +- .../fess/app/web/admin/systeminfo/AdminSysteminfoAction.java | 2 +- .../codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java | 2 +- .../org/codelibs/fess/app/web/admin/upgrade/UpgradeForm.java | 2 +- .../org/codelibs/fess/app/web/admin/user/AdminUserAction.java | 2 +- .../java/org/codelibs/fess/app/web/admin/user/CreateForm.java | 2 +- .../java/org/codelibs/fess/app/web/admin/user/EditForm.java | 2 +- .../java/org/codelibs/fess/app/web/admin/user/SearchForm.java | 2 +- .../codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java | 2 +- .../org/codelibs/fess/app/web/admin/webauth/CreateForm.java | 2 +- .../java/org/codelibs/fess/app/web/admin/webauth/EditForm.java | 2 +- .../org/codelibs/fess/app/web/admin/webauth/SearchForm.java | 2 +- .../fess/app/web/admin/webconfig/AdminWebconfigAction.java | 2 +- .../org/codelibs/fess/app/web/admin/webconfig/CreateForm.java | 2 +- .../org/codelibs/fess/app/web/admin/webconfig/EditForm.java | 2 +- .../org/codelibs/fess/app/web/admin/webconfig/SearchForm.java | 2 +- .../codelibs/fess/app/web/admin/wizard/AdminWizardAction.java | 2 +- .../codelibs/fess/app/web/admin/wizard/CrawlingConfigForm.java | 2 +- .../java/org/codelibs/fess/app/web/admin/wizard/IndexForm.java | 2 +- .../codelibs/fess/app/web/admin/wizard/StartCrawlingForm.java | 2 +- src/main/java/org/codelibs/fess/app/web/api/ApiResult.java | 2 +- src/main/java/org/codelibs/fess/app/web/api/FessApiAction.java | 2 +- .../org/codelibs/fess/app/web/api/admin/BaseSearchBody.java | 2 +- .../org/codelibs/fess/app/web/api/admin/FessApiAdminAction.java | 2 +- .../web/api/admin/accesstoken/ApiAdminAccesstokenAction.java | 2 +- .../codelibs/fess/app/web/api/admin/accesstoken/CreateBody.java | 2 +- .../codelibs/fess/app/web/api/admin/accesstoken/EditBody.java | 2 +- .../codelibs/fess/app/web/api/admin/accesstoken/SearchBody.java | 2 +- .../fess/app/web/api/admin/backup/ApiAdminBackupAction.java | 2 +- .../fess/app/web/api/admin/badword/ApiAdminBadwordAction.java | 2 +- .../org/codelibs/fess/app/web/api/admin/badword/CreateBody.java | 2 +- .../codelibs/fess/app/web/api/admin/badword/DownloadBody.java | 2 +- .../org/codelibs/fess/app/web/api/admin/badword/EditBody.java | 2 +- .../org/codelibs/fess/app/web/api/admin/badword/SearchBody.java | 2 +- .../fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java | 2 +- .../codelibs/fess/app/web/api/admin/boostdoc/CreateBody.java | 2 +- .../org/codelibs/fess/app/web/api/admin/boostdoc/EditBody.java | 2 +- .../codelibs/fess/app/web/api/admin/boostdoc/SearchBody.java | 2 +- .../web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java | 2 +- .../codelibs/fess/app/web/api/admin/crawlinginfo/EditBody.java | 2 +- .../fess/app/web/api/admin/crawlinginfo/SearchBody.java | 2 +- .../app/web/api/admin/dataconfig/ApiAdminDataconfigAction.java | 2 +- .../codelibs/fess/app/web/api/admin/dataconfig/CreateBody.java | 2 +- .../codelibs/fess/app/web/api/admin/dataconfig/EditBody.java | 2 +- .../codelibs/fess/app/web/api/admin/dataconfig/SearchBody.java | 2 +- .../fess/app/web/api/admin/dict/ApiAdminDictAction.java | 2 +- .../fess/app/web/api/admin/dict/BaseSearchDictBody.java | 2 +- .../java/org/codelibs/fess/app/web/api/admin/dict/ListBody.java | 2 +- .../web/api/admin/dict/kuromoji/ApiAdminDictKuromojiAction.java | 2 +- .../fess/app/web/api/admin/dict/kuromoji/CreateBody.java | 2 +- .../fess/app/web/api/admin/dict/kuromoji/DownloadBody.java | 2 +- .../codelibs/fess/app/web/api/admin/dict/kuromoji/EditBody.java | 2 +- .../fess/app/web/api/admin/dict/kuromoji/SearchBody.java | 2 +- .../web/api/admin/dict/mapping/ApiAdminDictMappingAction.java | 2 +- .../fess/app/web/api/admin/dict/mapping/CreateBody.java | 2 +- .../fess/app/web/api/admin/dict/mapping/DownloadBody.java | 2 +- .../codelibs/fess/app/web/api/admin/dict/mapping/EditBody.java | 2 +- .../fess/app/web/api/admin/dict/mapping/SearchBody.java | 2 +- .../api/admin/dict/protwords/ApiAdminDictProtwordsAction.java | 2 +- .../fess/app/web/api/admin/dict/protwords/CreateBody.java | 2 +- .../fess/app/web/api/admin/dict/protwords/DownloadBody.java | 2 +- .../fess/app/web/api/admin/dict/protwords/EditBody.java | 2 +- .../fess/app/web/api/admin/dict/protwords/SearchBody.java | 2 +- .../dict/stemmeroverride/ApiAdminDictStemmeroverrideAction.java | 2 +- .../fess/app/web/api/admin/dict/stemmeroverride/CreateBody.java | 2 +- .../app/web/api/admin/dict/stemmeroverride/DownloadBody.java | 2 +- .../fess/app/web/api/admin/dict/stemmeroverride/EditBody.java | 2 +- .../fess/app/web/api/admin/dict/stemmeroverride/SearchBody.java | 2 +- .../api/admin/dict/stopwords/ApiAdminDictStopwordsAction.java | 2 +- .../fess/app/web/api/admin/dict/stopwords/CreateBody.java | 2 +- .../fess/app/web/api/admin/dict/stopwords/DownloadBody.java | 2 +- .../fess/app/web/api/admin/dict/stopwords/EditBody.java | 2 +- .../fess/app/web/api/admin/dict/stopwords/SearchBody.java | 2 +- .../web/api/admin/dict/synonym/ApiAdminDictSynonymAction.java | 2 +- .../fess/app/web/api/admin/dict/synonym/CreateBody.java | 2 +- .../fess/app/web/api/admin/dict/synonym/DownloadBody.java | 2 +- .../codelibs/fess/app/web/api/admin/dict/synonym/EditBody.java | 2 +- .../fess/app/web/api/admin/dict/synonym/SearchBody.java | 2 +- .../api/admin/duplicatehost/ApiAdminDuplicatehostAction.java | 2 +- .../fess/app/web/api/admin/duplicatehost/CreateBody.java | 2 +- .../codelibs/fess/app/web/api/admin/duplicatehost/EditBody.java | 2 +- .../fess/app/web/api/admin/duplicatehost/SearchBody.java | 2 +- .../web/api/admin/elevateword/ApiAdminElevatewordAction.java | 2 +- .../codelibs/fess/app/web/api/admin/elevateword/CreateBody.java | 2 +- .../fess/app/web/api/admin/elevateword/DownloadBody.java | 2 +- .../codelibs/fess/app/web/api/admin/elevateword/EditBody.java | 2 +- .../codelibs/fess/app/web/api/admin/elevateword/SearchBody.java | 2 +- .../app/web/api/admin/failureurl/ApiAdminFailureurlAction.java | 2 +- .../codelibs/fess/app/web/api/admin/failureurl/EditBody.java | 2 +- .../codelibs/fess/app/web/api/admin/failureurl/SearchBody.java | 2 +- .../fess/app/web/api/admin/fileauth/ApiAdminFileauthAction.java | 2 +- .../codelibs/fess/app/web/api/admin/fileauth/CreateBody.java | 2 +- .../org/codelibs/fess/app/web/api/admin/fileauth/EditBody.java | 2 +- .../codelibs/fess/app/web/api/admin/fileauth/SearchBody.java | 2 +- .../app/web/api/admin/fileconfig/ApiAdminFileconfigAction.java | 2 +- .../codelibs/fess/app/web/api/admin/fileconfig/CreateBody.java | 2 +- .../codelibs/fess/app/web/api/admin/fileconfig/EditBody.java | 2 +- .../codelibs/fess/app/web/api/admin/fileconfig/SearchBody.java | 2 +- .../fess/app/web/api/admin/general/ApiAdminGeneralAction.java | 2 +- .../org/codelibs/fess/app/web/api/admin/general/EditBody.java | 2 +- .../fess/app/web/api/admin/group/ApiAdminGroupAction.java | 2 +- .../org/codelibs/fess/app/web/api/admin/group/CreateBody.java | 2 +- .../org/codelibs/fess/app/web/api/admin/group/EditBody.java | 2 +- .../org/codelibs/fess/app/web/api/admin/group/SearchBody.java | 2 +- .../fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java | 2 +- .../org/codelibs/fess/app/web/api/admin/joblog/EditBody.java | 2 +- .../org/codelibs/fess/app/web/api/admin/joblog/SearchBody.java | 2 +- .../fess/app/web/api/admin/keymatch/ApiAdminKeymatchAction.java | 2 +- .../codelibs/fess/app/web/api/admin/keymatch/CreateBody.java | 2 +- .../org/codelibs/fess/app/web/api/admin/keymatch/EditBody.java | 2 +- .../codelibs/fess/app/web/api/admin/keymatch/SearchBody.java | 2 +- .../app/web/api/admin/labeltype/ApiAdminLabeltypeAction.java | 2 +- .../codelibs/fess/app/web/api/admin/labeltype/CreateBody.java | 2 +- .../org/codelibs/fess/app/web/api/admin/labeltype/EditBody.java | 2 +- .../codelibs/fess/app/web/api/admin/labeltype/SearchBody.java | 2 +- .../codelibs/fess/app/web/api/admin/log/ApiAdminLogAction.java | 2 +- .../fess/app/web/api/admin/pathmap/ApiAdminPathmapAction.java | 2 +- .../org/codelibs/fess/app/web/api/admin/pathmap/CreateBody.java | 2 +- .../org/codelibs/fess/app/web/api/admin/pathmap/EditBody.java | 2 +- .../org/codelibs/fess/app/web/api/admin/pathmap/SearchBody.java | 2 +- .../fess/app/web/api/admin/plugin/ApiAdminPluginAction.java | 2 +- .../org/codelibs/fess/app/web/api/admin/plugin/DeleteBody.java | 2 +- .../org/codelibs/fess/app/web/api/admin/plugin/InstallBody.java | 2 +- .../api/admin/relatedcontent/ApiAdminRelatedcontentAction.java | 2 +- .../fess/app/web/api/admin/relatedcontent/CreateBody.java | 2 +- .../fess/app/web/api/admin/relatedcontent/EditBody.java | 2 +- .../fess/app/web/api/admin/relatedcontent/SearchBody.java | 2 +- .../web/api/admin/relatedquery/ApiAdminRelatedqueryAction.java | 2 +- .../fess/app/web/api/admin/relatedquery/CreateBody.java | 2 +- .../codelibs/fess/app/web/api/admin/relatedquery/EditBody.java | 2 +- .../fess/app/web/api/admin/relatedquery/SearchBody.java | 2 +- .../app/web/api/admin/reqheader/ApiAdminReqheaderAction.java | 2 +- .../codelibs/fess/app/web/api/admin/reqheader/CreateBody.java | 2 +- .../org/codelibs/fess/app/web/api/admin/reqheader/EditBody.java | 2 +- .../codelibs/fess/app/web/api/admin/reqheader/SearchBody.java | 2 +- .../fess/app/web/api/admin/role/ApiAdminRoleAction.java | 2 +- .../org/codelibs/fess/app/web/api/admin/role/CreateBody.java | 2 +- .../java/org/codelibs/fess/app/web/api/admin/role/EditBody.java | 2 +- .../org/codelibs/fess/app/web/api/admin/role/SearchBody.java | 2 +- .../app/web/api/admin/scheduler/ApiAdminSchedulerAction.java | 2 +- .../codelibs/fess/app/web/api/admin/scheduler/CreateBody.java | 2 +- .../org/codelibs/fess/app/web/api/admin/scheduler/EditBody.java | 2 +- .../codelibs/fess/app/web/api/admin/scheduler/SearchBody.java | 2 +- .../app/web/api/admin/searchlist/ApiAdminSearchlistAction.java | 2 +- .../codelibs/fess/app/web/api/admin/searchlist/CreateBody.java | 2 +- .../codelibs/fess/app/web/api/admin/searchlist/EditBody.java | 2 +- .../codelibs/fess/app/web/api/admin/searchlist/SearchBody.java | 2 +- .../fess/app/web/api/admin/stats/ApiAdminStatsAction.java | 2 +- .../fess/app/web/api/admin/storage/ApiAdminStorageAction.java | 2 +- .../org/codelibs/fess/app/web/api/admin/storage/UploadForm.java | 2 +- .../fess/app/web/api/admin/suggest/ApiAdminSuggestAction.java | 2 +- .../codelibs/fess/app/web/api/admin/suggest/SuggestBody.java | 2 +- .../app/web/api/admin/systeminfo/ApiAdminSysteminfoAction.java | 2 +- .../fess/app/web/api/admin/user/ApiAdminUserAction.java | 2 +- .../org/codelibs/fess/app/web/api/admin/user/CreateBody.java | 2 +- .../java/org/codelibs/fess/app/web/api/admin/user/EditBody.java | 2 +- .../org/codelibs/fess/app/web/api/admin/user/SearchBody.java | 2 +- .../fess/app/web/api/admin/webauth/ApiAdminWebauthAction.java | 2 +- .../org/codelibs/fess/app/web/api/admin/webauth/CreateBody.java | 2 +- .../org/codelibs/fess/app/web/api/admin/webauth/EditBody.java | 2 +- .../org/codelibs/fess/app/web/api/admin/webauth/SearchBody.java | 2 +- .../app/web/api/admin/webconfig/ApiAdminWebconfigAction.java | 2 +- .../codelibs/fess/app/web/api/admin/webconfig/CreateBody.java | 2 +- .../org/codelibs/fess/app/web/api/admin/webconfig/EditBody.java | 2 +- .../codelibs/fess/app/web/api/admin/webconfig/SearchBody.java | 2 +- .../java/org/codelibs/fess/app/web/base/FessAdminAction.java | 2 +- .../java/org/codelibs/fess/app/web/base/FessBaseAction.java | 2 +- .../java/org/codelibs/fess/app/web/base/FessLoginAction.java | 2 +- .../java/org/codelibs/fess/app/web/base/FessSearchAction.java | 2 +- src/main/java/org/codelibs/fess/app/web/base/SearchForm.java | 2 +- .../fess/app/web/base/login/ActionResponseCredential.java | 2 +- .../org/codelibs/fess/app/web/base/login/AzureAdCredential.java | 2 +- .../org/codelibs/fess/app/web/base/login/FessCredential.java | 2 +- .../org/codelibs/fess/app/web/base/login/FessLoginAssist.java | 2 +- .../codelibs/fess/app/web/base/login/LocalUserCredential.java | 2 +- .../fess/app/web/base/login/OpenIdConnectCredential.java | 2 +- .../org/codelibs/fess/app/web/base/login/SamlCredential.java | 2 +- .../org/codelibs/fess/app/web/base/login/SpnegoCredential.java | 2 +- src/main/java/org/codelibs/fess/app/web/cache/CacheAction.java | 2 +- src/main/java/org/codelibs/fess/app/web/cache/CacheForm.java | 2 +- src/main/java/org/codelibs/fess/app/web/error/ErrorAction.java | 2 +- .../org/codelibs/fess/app/web/error/ErrorBadrequrestAction.java | 2 +- src/main/java/org/codelibs/fess/app/web/error/ErrorForm.java | 2 +- .../org/codelibs/fess/app/web/error/ErrorNotfoundAction.java | 2 +- .../org/codelibs/fess/app/web/error/ErrorSystemerrorAction.java | 2 +- src/main/java/org/codelibs/fess/app/web/go/GoAction.java | 2 +- src/main/java/org/codelibs/fess/app/web/go/GoForm.java | 2 +- src/main/java/org/codelibs/fess/app/web/help/HelpAction.java | 2 +- src/main/java/org/codelibs/fess/app/web/login/LoginAction.java | 2 +- src/main/java/org/codelibs/fess/app/web/login/LoginForm.java | 2 +- src/main/java/org/codelibs/fess/app/web/login/PasswordForm.java | 2 +- .../java/org/codelibs/fess/app/web/logout/LogoutAction.java | 2 +- src/main/java/org/codelibs/fess/app/web/osdd/OsddAction.java | 2 +- .../java/org/codelibs/fess/app/web/profile/ProfileAction.java | 2 +- .../java/org/codelibs/fess/app/web/profile/ProfileForm.java | 2 +- .../java/org/codelibs/fess/app/web/search/SearchAction.java | 2 +- src/main/java/org/codelibs/fess/app/web/sso/SsoAction.java | 2 +- .../org/codelibs/fess/app/web/thumbnail/ThumbnailAction.java | 2 +- .../java/org/codelibs/fess/app/web/thumbnail/ThumbnailForm.java | 2 +- src/main/java/org/codelibs/fess/auth/AuthenticationManager.java | 2 +- .../java/org/codelibs/fess/auth/chain/AuthenticationChain.java | 2 +- src/main/java/org/codelibs/fess/auth/chain/CommandChain.java | 2 +- src/main/java/org/codelibs/fess/auth/chain/LdapChain.java | 2 +- src/main/java/org/codelibs/fess/cors/CorsHandler.java | 2 +- src/main/java/org/codelibs/fess/cors/CorsHandlerFactory.java | 2 +- src/main/java/org/codelibs/fess/cors/DefaultCorsHandler.java | 2 +- src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java | 2 +- .../codelibs/fess/crawler/interval/FessIntervalController.java | 2 +- .../codelibs/fess/crawler/processor/FessResponseProcessor.java | 2 +- .../fess/crawler/transformer/AbstractFessFileTransformer.java | 2 +- .../codelibs/fess/crawler/transformer/FessFileTransformer.java | 2 +- .../fess/crawler/transformer/FessStandardTransformer.java | 2 +- .../org/codelibs/fess/crawler/transformer/FessTransformer.java | 2 +- .../codelibs/fess/crawler/transformer/FessXpathTransformer.java | 2 +- .../java/org/codelibs/fess/crawler/util/FessCrawlerConfig.java | 2 +- src/main/java/org/codelibs/fess/dict/DictionaryCreator.java | 2 +- src/main/java/org/codelibs/fess/dict/DictionaryException.java | 2 +- .../java/org/codelibs/fess/dict/DictionaryExpiredException.java | 2 +- src/main/java/org/codelibs/fess/dict/DictionaryFile.java | 2 +- src/main/java/org/codelibs/fess/dict/DictionaryItem.java | 2 +- src/main/java/org/codelibs/fess/dict/DictionaryManager.java | 2 +- .../java/org/codelibs/fess/dict/kuromoji/KuromojiCreator.java | 2 +- src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiFile.java | 2 +- src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiItem.java | 2 +- .../java/org/codelibs/fess/dict/mapping/CharMappingCreator.java | 2 +- .../java/org/codelibs/fess/dict/mapping/CharMappingFile.java | 2 +- .../java/org/codelibs/fess/dict/mapping/CharMappingItem.java | 2 +- .../java/org/codelibs/fess/dict/protwords/ProtwordsCreator.java | 2 +- .../java/org/codelibs/fess/dict/protwords/ProtwordsFile.java | 2 +- .../java/org/codelibs/fess/dict/protwords/ProtwordsItem.java | 2 +- .../fess/dict/stemmeroverride/StemmerOverrideCreator.java | 2 +- .../codelibs/fess/dict/stemmeroverride/StemmerOverrideFile.java | 2 +- .../codelibs/fess/dict/stemmeroverride/StemmerOverrideItem.java | 2 +- .../java/org/codelibs/fess/dict/stopwords/StopwordsCreator.java | 2 +- .../java/org/codelibs/fess/dict/stopwords/StopwordsFile.java | 2 +- .../java/org/codelibs/fess/dict/stopwords/StopwordsItem.java | 2 +- .../java/org/codelibs/fess/dict/synonym/SynonymCreator.java | 2 +- src/main/java/org/codelibs/fess/dict/synonym/SynonymFile.java | 2 +- src/main/java/org/codelibs/fess/dict/synonym/SynonymItem.java | 2 +- src/main/java/org/codelibs/fess/ds/AbstractDataStore.java | 2 +- src/main/java/org/codelibs/fess/ds/DataStore.java | 2 +- src/main/java/org/codelibs/fess/ds/DataStoreFactory.java | 2 +- .../fess/ds/callback/FileListIndexUpdateCallbackImpl.java | 2 +- .../java/org/codelibs/fess/ds/callback/IndexUpdateCallback.java | 2 +- .../org/codelibs/fess/ds/callback/IndexUpdateCallbackImpl.java | 2 +- src/main/java/org/codelibs/fess/entity/DataStoreParams.java | 2 +- src/main/java/org/codelibs/fess/entity/FacetInfo.java | 2 +- src/main/java/org/codelibs/fess/entity/FacetQueryView.java | 2 +- src/main/java/org/codelibs/fess/entity/FessUser.java | 2 +- src/main/java/org/codelibs/fess/entity/GeoInfo.java | 2 +- src/main/java/org/codelibs/fess/entity/HighlightInfo.java | 2 +- src/main/java/org/codelibs/fess/entity/ParamMap.java | 2 +- src/main/java/org/codelibs/fess/entity/PingResponse.java | 2 +- src/main/java/org/codelibs/fess/entity/QueryContext.java | 2 +- src/main/java/org/codelibs/fess/entity/SearchLogEvent.java | 2 +- src/main/java/org/codelibs/fess/entity/SearchRenderData.java | 2 +- src/main/java/org/codelibs/fess/entity/SearchRequestParams.java | 2 +- .../java/org/codelibs/fess/es/client/CrawlerEngineClient.java | 2 +- .../java/org/codelibs/fess/es/client/SearchEngineClient.java | 2 +- .../codelibs/fess/es/client/SearchEngineClientException.java | 2 +- .../codelibs/fess/es/common/ImplementedInvokerAssistant.java | 2 +- .../codelibs/fess/es/config/allcommon/EsAbstractBehavior.java | 2 +- .../es/config/allcommon/EsAbstractConditionAggregation.java | 2 +- .../fess/es/config/allcommon/EsAbstractConditionBean.java | 2 +- .../fess/es/config/allcommon/EsAbstractConditionQuery.java | 2 +- .../org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java | 2 +- .../codelibs/fess/es/config/allcommon/EsPagingResultBean.java | 2 +- .../java/org/codelibs/fess/es/config/allcommon/EsSqlClause.java | 2 +- .../org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java | 2 +- .../java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java | 2 +- .../codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java | 2 +- .../org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java | 2 +- .../codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java | 2 +- .../java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java | 2 +- .../org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java | 2 +- .../org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java | 2 +- .../codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java | 2 +- .../java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java | 2 +- .../codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java | 2 +- .../java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java | 2 +- .../java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java | 2 +- .../java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java | 2 +- .../java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java | 2 +- .../org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java | 2 +- .../org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java | 2 +- .../org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java | 2 +- .../org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java | 2 +- .../java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java | 2 +- .../org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java | 2 +- .../org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java | 2 +- .../codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java | 2 +- .../java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java | 2 +- .../org/codelibs/fess/es/config/bsentity/BsAccessToken.java | 2 +- .../java/org/codelibs/fess/es/config/bsentity/BsBadWord.java | 2 +- .../codelibs/fess/es/config/bsentity/BsBoostDocumentRule.java | 2 +- .../org/codelibs/fess/es/config/bsentity/BsCrawlingInfo.java | 2 +- .../codelibs/fess/es/config/bsentity/BsCrawlingInfoParam.java | 2 +- .../java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java | 2 +- .../org/codelibs/fess/es/config/bsentity/BsDuplicateHost.java | 2 +- .../org/codelibs/fess/es/config/bsentity/BsElevateWord.java | 2 +- .../codelibs/fess/es/config/bsentity/BsElevateWordToLabel.java | 2 +- .../java/org/codelibs/fess/es/config/bsentity/BsFailureUrl.java | 2 +- .../codelibs/fess/es/config/bsentity/BsFileAuthentication.java | 2 +- .../java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java | 2 +- .../java/org/codelibs/fess/es/config/bsentity/BsJobLog.java | 2 +- .../java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java | 2 +- .../java/org/codelibs/fess/es/config/bsentity/BsLabelType.java | 2 +- .../org/codelibs/fess/es/config/bsentity/BsPathMapping.java | 2 +- .../org/codelibs/fess/es/config/bsentity/BsRelatedContent.java | 2 +- .../org/codelibs/fess/es/config/bsentity/BsRelatedQuery.java | 2 +- .../org/codelibs/fess/es/config/bsentity/BsRequestHeader.java | 2 +- .../java/org/codelibs/fess/es/config/bsentity/BsRoleType.java | 2 +- .../org/codelibs/fess/es/config/bsentity/BsScheduledJob.java | 2 +- .../org/codelibs/fess/es/config/bsentity/BsThumbnailQueue.java | 2 +- .../codelibs/fess/es/config/bsentity/BsWebAuthentication.java | 2 +- .../java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java | 2 +- .../codelibs/fess/es/config/bsentity/dbmeta/AccessTokenDbm.java | 2 +- .../org/codelibs/fess/es/config/bsentity/dbmeta/BadWordDbm.java | 2 +- .../fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java | 2 +- .../fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java | 2 +- .../fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java | 2 +- .../codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java | 2 +- .../fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java | 2 +- .../codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java | 2 +- .../fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java | 2 +- .../codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java | 2 +- .../fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java | 2 +- .../codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java | 2 +- .../org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java | 2 +- .../codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java | 2 +- .../codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java | 2 +- .../codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java | 2 +- .../fess/es/config/bsentity/dbmeta/RelatedContentDbm.java | 2 +- .../fess/es/config/bsentity/dbmeta/RelatedQueryDbm.java | 2 +- .../fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java | 2 +- .../codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java | 2 +- .../fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java | 2 +- .../fess/es/config/bsentity/dbmeta/ThumbnailQueueDbm.java | 2 +- .../fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java | 2 +- .../codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/AccessTokenCB.java | 2 +- src/main/java/org/codelibs/fess/es/config/cbean/BadWordCB.java | 2 +- .../org/codelibs/fess/es/config/cbean/BoostDocumentRuleCB.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/CrawlingInfoCB.java | 2 +- .../org/codelibs/fess/es/config/cbean/CrawlingInfoParamCB.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/DataConfigCB.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/DuplicateHostCB.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/ElevateWordCB.java | 2 +- .../org/codelibs/fess/es/config/cbean/ElevateWordToLabelCB.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/FailureUrlCB.java | 2 +- .../org/codelibs/fess/es/config/cbean/FileAuthenticationCB.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/FileConfigCB.java | 2 +- src/main/java/org/codelibs/fess/es/config/cbean/JobLogCB.java | 2 +- src/main/java/org/codelibs/fess/es/config/cbean/KeyMatchCB.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/LabelTypeCB.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/PathMappingCB.java | 2 +- .../org/codelibs/fess/es/config/cbean/RelatedContentCB.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/RelatedQueryCB.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/RequestHeaderCB.java | 2 +- src/main/java/org/codelibs/fess/es/config/cbean/RoleTypeCB.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/ScheduledJobCB.java | 2 +- .../org/codelibs/fess/es/config/cbean/ThumbnailQueueCB.java | 2 +- .../org/codelibs/fess/es/config/cbean/WebAuthenticationCB.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/WebConfigCB.java | 2 +- .../org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java | 2 +- .../codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java | 2 +- .../org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java | 2 +- .../codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java | 2 +- .../org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java | 2 +- .../org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java | 2 +- .../org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java | 2 +- .../fess/es/config/cbean/bs/BsElevateWordToLabelCB.java | 2 +- .../org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java | 2 +- .../fess/es/config/cbean/bs/BsFileAuthenticationCB.java | 2 +- .../org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java | 2 +- .../org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java | 2 +- .../org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java | 2 +- .../codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java | 2 +- .../org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java | 2 +- .../org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java | 2 +- .../org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java | 2 +- .../codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java | 2 +- .../codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java | 2 +- .../org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java | 2 +- .../org/codelibs/fess/es/config/cbean/ca/AccessTokenCA.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/ca/BadWordCA.java | 2 +- .../codelibs/fess/es/config/cbean/ca/BoostDocumentRuleCA.java | 2 +- .../org/codelibs/fess/es/config/cbean/ca/CrawlingInfoCA.java | 2 +- .../codelibs/fess/es/config/cbean/ca/CrawlingInfoParamCA.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/ca/DataConfigCA.java | 2 +- .../org/codelibs/fess/es/config/cbean/ca/DuplicateHostCA.java | 2 +- .../org/codelibs/fess/es/config/cbean/ca/ElevateWordCA.java | 2 +- .../codelibs/fess/es/config/cbean/ca/ElevateWordToLabelCA.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/ca/FailureUrlCA.java | 2 +- .../codelibs/fess/es/config/cbean/ca/FileAuthenticationCA.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/ca/FileConfigCA.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/ca/JobLogCA.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/ca/KeyMatchCA.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/ca/LabelTypeCA.java | 2 +- .../org/codelibs/fess/es/config/cbean/ca/PathMappingCA.java | 2 +- .../org/codelibs/fess/es/config/cbean/ca/RelatedContentCA.java | 2 +- .../org/codelibs/fess/es/config/cbean/ca/RelatedQueryCA.java | 2 +- .../org/codelibs/fess/es/config/cbean/ca/RequestHeaderCA.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/ca/RoleTypeCA.java | 2 +- .../org/codelibs/fess/es/config/cbean/ca/ScheduledJobCA.java | 2 +- .../org/codelibs/fess/es/config/cbean/ca/ThumbnailQueueCA.java | 2 +- .../codelibs/fess/es/config/cbean/ca/WebAuthenticationCA.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/ca/WebConfigCA.java | 2 +- .../codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java | 2 +- .../org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java | 2 +- .../fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java | 2 +- .../codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java | 2 +- .../fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java | 2 +- .../org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java | 2 +- .../codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java | 2 +- .../codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java | 2 +- .../fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java | 2 +- .../org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java | 2 +- .../fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java | 2 +- .../org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java | 2 +- .../org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java | 2 +- .../org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java | 2 +- .../org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java | 2 +- .../codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java | 2 +- .../codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java | 2 +- .../codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java | 2 +- .../codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java | 2 +- .../org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java | 2 +- .../codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java | 2 +- .../codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java | 2 +- .../fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java | 2 +- .../org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java | 2 +- .../org/codelibs/fess/es/config/cbean/cq/AccessTokenCQ.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/cq/BadWordCQ.java | 2 +- .../codelibs/fess/es/config/cbean/cq/BoostDocumentRuleCQ.java | 2 +- .../org/codelibs/fess/es/config/cbean/cq/CrawlingInfoCQ.java | 2 +- .../codelibs/fess/es/config/cbean/cq/CrawlingInfoParamCQ.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/cq/DataConfigCQ.java | 2 +- .../org/codelibs/fess/es/config/cbean/cq/DuplicateHostCQ.java | 2 +- .../org/codelibs/fess/es/config/cbean/cq/ElevateWordCQ.java | 2 +- .../codelibs/fess/es/config/cbean/cq/ElevateWordToLabelCQ.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/cq/FailureUrlCQ.java | 2 +- .../codelibs/fess/es/config/cbean/cq/FileAuthenticationCQ.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/cq/FileConfigCQ.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/cq/JobLogCQ.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/cq/KeyMatchCQ.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/cq/LabelTypeCQ.java | 2 +- .../org/codelibs/fess/es/config/cbean/cq/PathMappingCQ.java | 2 +- .../org/codelibs/fess/es/config/cbean/cq/RelatedContentCQ.java | 2 +- .../org/codelibs/fess/es/config/cbean/cq/RelatedQueryCQ.java | 2 +- .../org/codelibs/fess/es/config/cbean/cq/RequestHeaderCQ.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/cq/RoleTypeCQ.java | 2 +- .../org/codelibs/fess/es/config/cbean/cq/ScheduledJobCQ.java | 2 +- .../org/codelibs/fess/es/config/cbean/cq/ThumbnailQueueCQ.java | 2 +- .../codelibs/fess/es/config/cbean/cq/WebAuthenticationCQ.java | 2 +- .../java/org/codelibs/fess/es/config/cbean/cq/WebConfigCQ.java | 2 +- .../codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java | 2 +- .../org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java | 2 +- .../fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java | 2 +- .../codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java | 2 +- .../fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java | 2 +- .../org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java | 2 +- .../codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java | 2 +- .../codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java | 2 +- .../fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java | 2 +- .../org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java | 2 +- .../fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java | 2 +- .../org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java | 2 +- .../org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java | 2 +- .../org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java | 2 +- .../org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java | 2 +- .../codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java | 2 +- .../codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java | 2 +- .../codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java | 2 +- .../codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java | 2 +- .../org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java | 2 +- .../codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java | 2 +- .../codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java | 2 +- .../fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java | 2 +- .../org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java | 2 +- .../java/org/codelibs/fess/es/config/exbhv/AccessTokenBhv.java | 2 +- src/main/java/org/codelibs/fess/es/config/exbhv/BadWordBhv.java | 2 +- .../org/codelibs/fess/es/config/exbhv/BoostDocumentRuleBhv.java | 2 +- .../java/org/codelibs/fess/es/config/exbhv/CrawlingInfoBhv.java | 2 +- .../org/codelibs/fess/es/config/exbhv/CrawlingInfoParamBhv.java | 2 +- .../java/org/codelibs/fess/es/config/exbhv/DataConfigBhv.java | 2 +- .../org/codelibs/fess/es/config/exbhv/DuplicateHostBhv.java | 2 +- .../java/org/codelibs/fess/es/config/exbhv/ElevateWordBhv.java | 2 +- .../codelibs/fess/es/config/exbhv/ElevateWordToLabelBhv.java | 2 +- .../java/org/codelibs/fess/es/config/exbhv/FailureUrlBhv.java | 2 +- .../codelibs/fess/es/config/exbhv/FileAuthenticationBhv.java | 2 +- .../java/org/codelibs/fess/es/config/exbhv/FileConfigBhv.java | 2 +- src/main/java/org/codelibs/fess/es/config/exbhv/JobLogBhv.java | 2 +- .../java/org/codelibs/fess/es/config/exbhv/KeyMatchBhv.java | 2 +- .../java/org/codelibs/fess/es/config/exbhv/LabelTypeBhv.java | 2 +- .../java/org/codelibs/fess/es/config/exbhv/PathMappingBhv.java | 2 +- .../org/codelibs/fess/es/config/exbhv/RelatedContentBhv.java | 2 +- .../java/org/codelibs/fess/es/config/exbhv/RelatedQueryBhv.java | 2 +- .../org/codelibs/fess/es/config/exbhv/RequestHeaderBhv.java | 2 +- .../java/org/codelibs/fess/es/config/exbhv/RoleTypeBhv.java | 2 +- .../java/org/codelibs/fess/es/config/exbhv/ScheduledJobBhv.java | 2 +- .../org/codelibs/fess/es/config/exbhv/ThumbnailQueueBhv.java | 2 +- .../org/codelibs/fess/es/config/exbhv/WebAuthenticationBhv.java | 2 +- .../java/org/codelibs/fess/es/config/exbhv/WebConfigBhv.java | 2 +- .../java/org/codelibs/fess/es/config/exentity/AccessToken.java | 2 +- src/main/java/org/codelibs/fess/es/config/exentity/BadWord.java | 2 +- .../org/codelibs/fess/es/config/exentity/BoostDocumentRule.java | 2 +- .../org/codelibs/fess/es/config/exentity/CrawlingConfig.java | 2 +- .../codelibs/fess/es/config/exentity/CrawlingConfigWrapper.java | 2 +- .../java/org/codelibs/fess/es/config/exentity/CrawlingInfo.java | 2 +- .../org/codelibs/fess/es/config/exentity/CrawlingInfoParam.java | 2 +- .../java/org/codelibs/fess/es/config/exentity/DataConfig.java | 2 +- .../org/codelibs/fess/es/config/exentity/DuplicateHost.java | 2 +- .../java/org/codelibs/fess/es/config/exentity/ElevateWord.java | 2 +- .../codelibs/fess/es/config/exentity/ElevateWordToLabel.java | 2 +- .../java/org/codelibs/fess/es/config/exentity/FailureUrl.java | 2 +- .../codelibs/fess/es/config/exentity/FileAuthentication.java | 2 +- .../java/org/codelibs/fess/es/config/exentity/FileConfig.java | 2 +- src/main/java/org/codelibs/fess/es/config/exentity/JobLog.java | 2 +- .../java/org/codelibs/fess/es/config/exentity/KeyMatch.java | 2 +- .../java/org/codelibs/fess/es/config/exentity/LabelType.java | 2 +- .../java/org/codelibs/fess/es/config/exentity/PathMapping.java | 2 +- .../org/codelibs/fess/es/config/exentity/RelatedContent.java | 2 +- .../java/org/codelibs/fess/es/config/exentity/RelatedQuery.java | 2 +- .../org/codelibs/fess/es/config/exentity/RequestHeader.java | 2 +- .../java/org/codelibs/fess/es/config/exentity/RoleType.java | 2 +- .../java/org/codelibs/fess/es/config/exentity/ScheduledJob.java | 2 +- .../org/codelibs/fess/es/config/exentity/ThumbnailQueue.java | 2 +- .../org/codelibs/fess/es/config/exentity/WebAuthentication.java | 2 +- .../java/org/codelibs/fess/es/config/exentity/WebConfig.java | 2 +- .../org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java | 2 +- .../fess/es/log/allcommon/EsAbstractConditionAggregation.java | 2 +- .../codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java | 2 +- .../fess/es/log/allcommon/EsAbstractConditionQuery.java | 2 +- .../org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java | 2 +- .../org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java | 2 +- .../java/org/codelibs/fess/es/log/allcommon/EsSqlClause.java | 2 +- src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java | 2 +- .../java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java | 2 +- .../java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java | 2 +- src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java | 2 +- src/main/java/org/codelibs/fess/es/log/bsentity/BsClickLog.java | 2 +- .../java/org/codelibs/fess/es/log/bsentity/BsFavoriteLog.java | 2 +- .../java/org/codelibs/fess/es/log/bsentity/BsSearchLog.java | 2 +- src/main/java/org/codelibs/fess/es/log/bsentity/BsUserInfo.java | 2 +- .../org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java | 2 +- .../codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java | 2 +- .../org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java | 2 +- .../org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java | 2 +- src/main/java/org/codelibs/fess/es/log/cbean/ClickLogCB.java | 2 +- src/main/java/org/codelibs/fess/es/log/cbean/FavoriteLogCB.java | 2 +- src/main/java/org/codelibs/fess/es/log/cbean/SearchLogCB.java | 2 +- src/main/java/org/codelibs/fess/es/log/cbean/UserInfoCB.java | 2 +- .../java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java | 2 +- .../java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java | 2 +- .../java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java | 2 +- .../java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java | 2 +- src/main/java/org/codelibs/fess/es/log/cbean/ca/ClickLogCA.java | 2 +- .../java/org/codelibs/fess/es/log/cbean/ca/FavoriteLogCA.java | 2 +- .../java/org/codelibs/fess/es/log/cbean/ca/SearchLogCA.java | 2 +- src/main/java/org/codelibs/fess/es/log/cbean/ca/UserInfoCA.java | 2 +- .../java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java | 2 +- .../org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java | 2 +- .../org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java | 2 +- .../java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java | 2 +- src/main/java/org/codelibs/fess/es/log/cbean/cq/ClickLogCQ.java | 2 +- .../java/org/codelibs/fess/es/log/cbean/cq/FavoriteLogCQ.java | 2 +- .../java/org/codelibs/fess/es/log/cbean/cq/SearchLogCQ.java | 2 +- src/main/java/org/codelibs/fess/es/log/cbean/cq/UserInfoCQ.java | 2 +- .../java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java | 2 +- .../org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java | 2 +- .../org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java | 2 +- .../java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java | 2 +- src/main/java/org/codelibs/fess/es/log/exbhv/ClickLogBhv.java | 2 +- .../java/org/codelibs/fess/es/log/exbhv/FavoriteLogBhv.java | 2 +- src/main/java/org/codelibs/fess/es/log/exbhv/SearchLogBhv.java | 2 +- src/main/java/org/codelibs/fess/es/log/exbhv/UserInfoBhv.java | 2 +- src/main/java/org/codelibs/fess/es/log/exentity/ClickLog.java | 2 +- .../java/org/codelibs/fess/es/log/exentity/FavoriteLog.java | 2 +- src/main/java/org/codelibs/fess/es/log/exentity/SearchLog.java | 2 +- src/main/java/org/codelibs/fess/es/log/exentity/UserInfo.java | 2 +- .../java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java | 2 +- .../org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java | 2 +- .../fess/es/user/allcommon/EsAbstractConditionAggregation.java | 2 +- .../fess/es/user/allcommon/EsAbstractConditionBean.java | 2 +- .../fess/es/user/allcommon/EsAbstractConditionQuery.java | 2 +- .../org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java | 2 +- .../org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java | 2 +- .../java/org/codelibs/fess/es/user/allcommon/EsSqlClause.java | 2 +- src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java | 2 +- src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java | 2 +- src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java | 2 +- src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java | 2 +- src/main/java/org/codelibs/fess/es/user/bsentity/BsRole.java | 2 +- src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java | 2 +- .../org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java | 2 +- .../java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java | 2 +- .../java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java | 2 +- src/main/java/org/codelibs/fess/es/user/cbean/GroupCB.java | 2 +- src/main/java/org/codelibs/fess/es/user/cbean/RoleCB.java | 2 +- src/main/java/org/codelibs/fess/es/user/cbean/UserCB.java | 2 +- src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java | 2 +- src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java | 2 +- src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java | 2 +- src/main/java/org/codelibs/fess/es/user/cbean/ca/GroupCA.java | 2 +- src/main/java/org/codelibs/fess/es/user/cbean/ca/RoleCA.java | 2 +- src/main/java/org/codelibs/fess/es/user/cbean/ca/UserCA.java | 2 +- .../java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java | 2 +- .../java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java | 2 +- .../java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java | 2 +- src/main/java/org/codelibs/fess/es/user/cbean/cq/GroupCQ.java | 2 +- src/main/java/org/codelibs/fess/es/user/cbean/cq/RoleCQ.java | 2 +- src/main/java/org/codelibs/fess/es/user/cbean/cq/UserCQ.java | 2 +- .../java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java | 2 +- .../java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java | 2 +- .../java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java | 2 +- src/main/java/org/codelibs/fess/es/user/exbhv/GroupBhv.java | 2 +- src/main/java/org/codelibs/fess/es/user/exbhv/RoleBhv.java | 2 +- src/main/java/org/codelibs/fess/es/user/exbhv/UserBhv.java | 2 +- src/main/java/org/codelibs/fess/es/user/exentity/Group.java | 2 +- src/main/java/org/codelibs/fess/es/user/exentity/Role.java | 2 +- src/main/java/org/codelibs/fess/es/user/exentity/User.java | 2 +- .../org/codelibs/fess/exception/CommandExecutionException.java | 2 +- .../codelibs/fess/exception/ContainerNotAvailableException.java | 2 +- .../org/codelibs/fess/exception/ContentNotFoundException.java | 2 +- .../org/codelibs/fess/exception/DataStoreCrawlingException.java | 2 +- .../java/org/codelibs/fess/exception/DataStoreException.java | 2 +- .../java/org/codelibs/fess/exception/FessSystemException.java | 2 +- .../org/codelibs/fess/exception/FessUserNotFoundException.java | 2 +- .../java/org/codelibs/fess/exception/GsaConfigException.java | 2 +- .../codelibs/fess/exception/InvalidAccessTokenException.java | 2 +- .../java/org/codelibs/fess/exception/InvalidQueryException.java | 2 +- .../java/org/codelibs/fess/exception/JobNotFoundException.java | 2 +- .../org/codelibs/fess/exception/JobProcessingException.java | 2 +- .../org/codelibs/fess/exception/LdapConfigurationException.java | 2 +- .../org/codelibs/fess/exception/LdapOperationException.java | 2 +- src/main/java/org/codelibs/fess/exception/PluginException.java | 2 +- .../java/org/codelibs/fess/exception/QueryParseException.java | 2 +- .../codelibs/fess/exception/ResultOffsetExceededException.java | 2 +- .../java/org/codelibs/fess/exception/ScheduledJobException.java | 2 +- .../java/org/codelibs/fess/exception/ScriptEngineException.java | 2 +- .../java/org/codelibs/fess/exception/SearchQueryException.java | 2 +- .../org/codelibs/fess/exception/ServletRuntimeException.java | 2 +- .../java/org/codelibs/fess/exception/SsoLoginException.java | 2 +- .../java/org/codelibs/fess/exception/SsoMessageException.java | 2 +- .../java/org/codelibs/fess/exception/SsoProcessException.java | 2 +- src/main/java/org/codelibs/fess/exception/StorageException.java | 2 +- src/main/java/org/codelibs/fess/exception/ThemeException.java | 2 +- .../codelibs/fess/exception/ThumbnailGenerationException.java | 2 +- .../org/codelibs/fess/exception/UnsupportedSearchException.java | 2 +- .../org/codelibs/fess/exception/UserRoleLoginException.java | 2 +- src/main/java/org/codelibs/fess/exception/WebApiException.java | 2 +- src/main/java/org/codelibs/fess/exec/Crawler.java | 2 +- src/main/java/org/codelibs/fess/exec/SuggestCreator.java | 2 +- src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java | 2 +- src/main/java/org/codelibs/fess/filter/CorsFilter.java | 2 +- src/main/java/org/codelibs/fess/filter/EncodingFilter.java | 2 +- src/main/java/org/codelibs/fess/filter/WebApiFilter.java | 2 +- .../java/org/codelibs/fess/helper/AbstractConfigHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/AccessTokenHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/ActivityHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/CrawlerStatsHelper.java | 2 +- .../java/org/codelibs/fess/helper/CrawlingConfigHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/CurlHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/DataIndexHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/DocumentHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/DuplicateHostHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/FileTypeHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/IndexingHelper.java | 2 +- .../java/org/codelibs/fess/helper/IntervalControlHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/JobHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/LanguageHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/NotificationHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/OsddHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/PathMappingHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/PermissionHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/PluginHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/PopularWordHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/ProcessHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/QueryHelper.java | 2 +- .../java/org/codelibs/fess/helper/RelatedContentHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/RelatedQueryHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/RoleQueryHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/SambaHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/SearchHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/SearchLogHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/SuggestHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/SystemHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/ThemeHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/UserAgentHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/UserInfoHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/ViewHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/VirtualHostHelper.java | 2 +- src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java | 2 +- src/main/java/org/codelibs/fess/indexer/DocBoostMatcher.java | 2 +- src/main/java/org/codelibs/fess/indexer/IndexUpdater.java | 2 +- src/main/java/org/codelibs/fess/ingest/IngestFactory.java | 2 +- src/main/java/org/codelibs/fess/ingest/Ingester.java | 2 +- src/main/java/org/codelibs/fess/job/AggregateLogJob.java | 2 +- src/main/java/org/codelibs/fess/job/CrawlJob.java | 2 +- src/main/java/org/codelibs/fess/job/ExecJob.java | 2 +- src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java | 2 +- src/main/java/org/codelibs/fess/job/JobExecutor.java | 2 +- src/main/java/org/codelibs/fess/job/PingSearchEngineJob.java | 2 +- src/main/java/org/codelibs/fess/job/PurgeDocJob.java | 2 +- src/main/java/org/codelibs/fess/job/PurgeLogJob.java | 2 +- src/main/java/org/codelibs/fess/job/PurgeThumbnailJob.java | 2 +- src/main/java/org/codelibs/fess/job/PythonJob.java | 2 +- src/main/java/org/codelibs/fess/job/SuggestJob.java | 2 +- src/main/java/org/codelibs/fess/job/UpdateLabelJob.java | 2 +- src/main/java/org/codelibs/fess/job/impl/ScriptExecutor.java | 2 +- src/main/java/org/codelibs/fess/ldap/LdapManager.java | 2 +- src/main/java/org/codelibs/fess/ldap/LdapUser.java | 2 +- .../java/org/codelibs/fess/mylasta/action/FessHtmlPath.java | 2 +- src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java | 2 +- .../java/org/codelibs/fess/mylasta/action/FessMessages.java | 2 +- .../java/org/codelibs/fess/mylasta/action/FessUserBean.java | 2 +- .../java/org/codelibs/fess/mylasta/creator/PagerCreator.java | 2 +- .../java/org/codelibs/fess/mylasta/direction/FessConfig.java | 2 +- .../org/codelibs/fess/mylasta/direction/FessConfigImpl.java | 2 +- src/main/java/org/codelibs/fess/mylasta/direction/FessEnv.java | 2 +- .../fess/mylasta/direction/FessFwAssistantDirector.java | 2 +- src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java | 2 +- .../mylasta/direction/sponsor/FessActionAdjustmentProvider.java | 2 +- .../fess/mylasta/direction/sponsor/FessApiFailureHook.java | 2 +- .../mylasta/direction/sponsor/FessCookieResourceProvider.java | 2 +- .../fess/mylasta/direction/sponsor/FessCurtainBeforeHook.java | 2 +- .../fess/mylasta/direction/sponsor/FessCurtainFinallyHook.java | 2 +- .../mylasta/direction/sponsor/FessJsonResourceProvider.java | 2 +- .../direction/sponsor/FessListedClassificationProvider.java | 2 +- .../direction/sponsor/FessMailDeliveryDepartmentCreator.java | 2 +- .../mylasta/direction/sponsor/FessMultipartRequestHandler.java | 2 +- .../mylasta/direction/sponsor/FessSecurityResourceProvider.java | 2 +- .../mylasta/direction/sponsor/FessTimeResourceProvider.java | 2 +- .../direction/sponsor/FessUserLocaleProcessProvider.java | 2 +- .../direction/sponsor/FessUserTimeZoneProcessProvider.java | 2 +- .../java/org/codelibs/fess/mylasta/mail/CrawlerPostcard.java | 2 +- .../java/org/codelibs/fess/mylasta/mail/EsStatusPostcard.java | 2 +- .../java/org/codelibs/fess/mylasta/mail/TestmailPostcard.java | 2 +- src/main/java/org/codelibs/fess/query/BooleanQueryCommand.java | 2 +- src/main/java/org/codelibs/fess/query/BoostQueryCommand.java | 2 +- src/main/java/org/codelibs/fess/query/FuzzyQueryCommand.java | 2 +- src/main/java/org/codelibs/fess/query/MatchAllQueryCommand.java | 2 +- src/main/java/org/codelibs/fess/query/PhraseQueryCommand.java | 2 +- src/main/java/org/codelibs/fess/query/PrefixQueryCommand.java | 2 +- src/main/java/org/codelibs/fess/query/QueryCommand.java | 2 +- src/main/java/org/codelibs/fess/query/QueryFieldConfig.java | 2 +- src/main/java/org/codelibs/fess/query/QueryProcessor.java | 2 +- src/main/java/org/codelibs/fess/query/TermQueryCommand.java | 2 +- .../java/org/codelibs/fess/query/TermRangeQueryCommand.java | 2 +- src/main/java/org/codelibs/fess/query/WildcardQueryCommand.java | 2 +- src/main/java/org/codelibs/fess/query/parser/QueryParser.java | 2 +- .../java/org/codelibs/fess/rank/fusion/DefaultSearcher.java | 2 +- .../java/org/codelibs/fess/rank/fusion/RankFusionProcessor.java | 2 +- .../java/org/codelibs/fess/rank/fusion/RankFusionSearcher.java | 2 +- src/main/java/org/codelibs/fess/rank/fusion/SearchResult.java | 2 +- src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java | 2 +- src/main/java/org/codelibs/fess/score/QueryRescorer.java | 2 +- src/main/java/org/codelibs/fess/score/ScoreBooster.java | 2 +- src/main/java/org/codelibs/fess/score/ScoreUpdater.java | 2 +- .../java/org/codelibs/fess/script/AbstractScriptEngine.java | 2 +- src/main/java/org/codelibs/fess/script/ScriptEngine.java | 2 +- src/main/java/org/codelibs/fess/script/ScriptEngineFactory.java | 2 +- src/main/java/org/codelibs/fess/sso/SsoAuthenticator.java | 2 +- src/main/java/org/codelibs/fess/sso/SsoManager.java | 2 +- src/main/java/org/codelibs/fess/sso/SsoResponseType.java | 2 +- .../java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java | 2 +- .../org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java | 2 +- src/main/java/org/codelibs/fess/sso/saml/SamlAuthenticator.java | 2 +- .../java/org/codelibs/fess/sso/spnego/SpnegoAuthenticator.java | 2 +- src/main/java/org/codelibs/fess/taglib/FessFunctions.java | 2 +- .../java/org/codelibs/fess/thumbnail/ThumbnailGenerator.java | 2 +- src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java | 2 +- .../codelibs/fess/thumbnail/impl/BaseThumbnailGenerator.java | 2 +- .../java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java | 2 +- .../java/org/codelibs/fess/thumbnail/impl/EmptyGenerator.java | 2 +- .../org/codelibs/fess/thumbnail/impl/HtmlTagBasedGenerator.java | 2 +- .../java/org/codelibs/fess/timer/HotThreadMonitorTarget.java | 2 +- src/main/java/org/codelibs/fess/timer/MonitorTarget.java | 2 +- src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java | 2 +- .../codelibs/fess/tomcat/valve/SuppressErrorReportValve.java | 2 +- .../codelibs/fess/tomcat/webresources/FessWebResourceRoot.java | 2 +- src/main/java/org/codelibs/fess/util/BooleanFunction.java | 2 +- src/main/java/org/codelibs/fess/util/ComponentUtil.java | 2 +- src/main/java/org/codelibs/fess/util/DocList.java | 2 +- src/main/java/org/codelibs/fess/util/DocMap.java | 2 +- src/main/java/org/codelibs/fess/util/DocumentUtil.java | 2 +- .../java/org/codelibs/fess/util/ErrorToWarnRewritePolicy.java | 2 +- src/main/java/org/codelibs/fess/util/FacetResponse.java | 2 +- src/main/java/org/codelibs/fess/util/GsaConfigParser.java | 2 +- src/main/java/org/codelibs/fess/util/InputStreamThread.java | 2 +- src/main/java/org/codelibs/fess/util/JobProcess.java | 2 +- src/main/java/org/codelibs/fess/util/JvmUtil.java | 2 +- src/main/java/org/codelibs/fess/util/KuromojiCSVUtil.java | 2 +- src/main/java/org/codelibs/fess/util/MemoryUtil.java | 2 +- src/main/java/org/codelibs/fess/util/OptionalUtil.java | 2 +- src/main/java/org/codelibs/fess/util/ParameterUtil.java | 2 +- src/main/java/org/codelibs/fess/util/PrunedTag.java | 2 +- src/main/java/org/codelibs/fess/util/QueryResponseList.java | 2 +- src/main/java/org/codelibs/fess/util/QueryStringBuilder.java | 2 +- src/main/java/org/codelibs/fess/util/RenderDataUtil.java | 2 +- src/main/java/org/codelibs/fess/util/ResourceUtil.java | 2 +- src/main/java/org/codelibs/fess/util/SearchEngineUtil.java | 2 +- src/main/java/org/codelibs/fess/util/SystemUtil.java | 2 +- src/main/java/org/codelibs/fess/util/ThreadDumpUtil.java | 2 +- src/main/java/org/codelibs/fess/util/UpgradeUtil.java | 2 +- src/main/java/org/codelibs/fess/util/WebApiUtil.java | 2 +- src/main/java/org/codelibs/fess/validation/CronExpression.java | 2 +- .../org/codelibs/fess/validation/CronExpressionValidator.java | 2 +- src/main/java/org/codelibs/fess/validation/CustomSize.java | 2 +- .../java/org/codelibs/fess/validation/CustomSizeValidator.java | 2 +- .../java/org/codelibs/fess/validation/FessActionValidator.java | 2 +- src/main/java/org/codelibs/fess/validation/UriType.java | 2 +- .../java/org/codelibs/fess/validation/UriTypeValidator.java | 2 +- .../java/org/codelibs/fess/app/pager/AccessTokenPagerTest.java | 2 +- src/test/java/org/codelibs/fess/app/pager/BadWordPagerTest.java | 2 +- .../java/org/codelibs/fess/app/pager/BoostDocPagerTest.java | 2 +- .../java/org/codelibs/fess/app/pager/CharMappingPagerTest.java | 2 +- .../java/org/codelibs/fess/app/pager/CrawlingInfoPagerTest.java | 2 +- .../java/org/codelibs/fess/app/pager/DataConfigPagerTest.java | 2 +- .../org/codelibs/fess/app/pager/DuplicateHostPagerTest.java | 2 +- .../java/org/codelibs/fess/crawler/FessCrawlerThreadTest.java | 2 +- .../fess/crawler/transformer/FessFileTransformerTest.java | 2 +- .../fess/crawler/transformer/FessXpathTransformerTest.java | 2 +- src/test/java/org/codelibs/fess/dict/DictionaryManagerTest.java | 2 +- .../java/org/codelibs/fess/dict/kuromoji/KuromojiFileTest.java | 2 +- .../java/org/codelibs/fess/dict/kuromoji/KuromojiItemTest.java | 2 +- .../fess/dict/stemmeroverride/StemmerOverrideFileTest.java | 2 +- .../fess/dict/stemmeroverride/StemmerOverrideItemTest.java | 2 +- .../java/org/codelibs/fess/dict/synonym/SynonymFileTest.java | 2 +- .../java/org/codelibs/fess/dict/synonym/SynonymItemTest.java | 2 +- src/test/java/org/codelibs/fess/ds/AbstractDataStoreTest.java | 2 +- src/test/java/org/codelibs/fess/entity/GeoInfoTest.java | 2 +- src/test/java/org/codelibs/fess/entity/ParamMapTest.java | 2 +- .../org/codelibs/fess/es/config/exentity/WebConfigTest.java | 2 +- src/test/java/org/codelibs/fess/filter/EncodingFilterTest.java | 2 +- .../java/org/codelibs/fess/helper/AccessTokenHelperTest.java | 2 +- src/test/java/org/codelibs/fess/helper/ActivityHelperTest.java | 2 +- .../java/org/codelibs/fess/helper/CrawlerStatsHelperTest.java | 2 +- .../java/org/codelibs/fess/helper/CrawlingConfigHelperTest.java | 2 +- .../java/org/codelibs/fess/helper/CrawlingInfoHelperTest.java | 2 +- src/test/java/org/codelibs/fess/helper/DocumentHelperTest.java | 2 +- .../java/org/codelibs/fess/helper/DuplicateHostHelperTest.java | 2 +- src/test/java/org/codelibs/fess/helper/IndexingHelperTest.java | 2 +- .../org/codelibs/fess/helper/IntervalControlHelperTest.java | 2 +- src/test/java/org/codelibs/fess/helper/LabelTypeHelperTest.java | 2 +- src/test/java/org/codelibs/fess/helper/LanguageHelperTest.java | 2 +- src/test/java/org/codelibs/fess/helper/OsddHelperTest.java | 2 +- .../java/org/codelibs/fess/helper/PathMappingHelperTest.java | 2 +- .../java/org/codelibs/fess/helper/PermissionHelperTest.java | 2 +- src/test/java/org/codelibs/fess/helper/PluginHelperTest.java | 2 +- src/test/java/org/codelibs/fess/helper/QueryHelperTest.java | 2 +- src/test/java/org/codelibs/fess/helper/RoleQueryHelperTest.java | 2 +- src/test/java/org/codelibs/fess/helper/SystemHelperTest.java | 2 +- src/test/java/org/codelibs/fess/helper/UserAgentHelperTest.java | 2 +- src/test/java/org/codelibs/fess/helper/UserInfoHelperTest.java | 2 +- src/test/java/org/codelibs/fess/helper/ViewHelperTest.java | 2 +- .../java/org/codelibs/fess/indexer/DocBoostMatcherTest.java | 2 +- src/test/java/org/codelibs/fess/ingest/IngestFactoryTest.java | 2 +- src/test/java/org/codelibs/fess/it/CrawlTestBase.java | 2 +- src/test/java/org/codelibs/fess/it/CrudTestBase.java | 2 +- src/test/java/org/codelibs/fess/it/ITBase.java | 2 +- src/test/java/org/codelibs/fess/it/admin/AccessTokenTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/BackupTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/BadWordTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/BoostDocTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/CrawlerLogTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/DataConfigTests.java | 2 +- .../java/org/codelibs/fess/it/admin/DuplicateHostTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/ElevateWordTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/FileAuthTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/FileConfigTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/GeneralTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/GroupTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/JobLogTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/KeyMatchTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/LabelTypeTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/LogTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/PathMapTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/PluginTests.java | 2 +- .../java/org/codelibs/fess/it/admin/RelatedContentTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/RelatedQueryTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/ReqHeaderTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/RoleTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/SchedulerTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/SearchListTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/StorageTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/SuggestTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/SystemInfoTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/UserTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/WebAuthTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/WebConfigTests.java | 2 +- .../java/org/codelibs/fess/it/admin/dict/DictCrudTestBase.java | 2 +- src/test/java/org/codelibs/fess/it/admin/dict/DictTests.java | 2 +- .../java/org/codelibs/fess/it/admin/dict/KuromojiTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/dict/MappingTests.java | 2 +- .../java/org/codelibs/fess/it/admin/dict/ProtwordsTests.java | 2 +- .../org/codelibs/fess/it/admin/dict/StemmerOverrideTests.java | 2 +- .../java/org/codelibs/fess/it/admin/dict/StopwordsTests.java | 2 +- src/test/java/org/codelibs/fess/it/admin/dict/SynonymTests.java | 2 +- src/test/java/org/codelibs/fess/it/search/SearchApiTests.java | 2 +- src/test/java/org/codelibs/fess/ldap/LdapManagerTest.java | 2 +- src/test/java/org/codelibs/fess/mylasta/FessActionDefTest.java | 2 +- src/test/java/org/codelibs/fess/mylasta/FessLastaDocTest.java | 2 +- .../java/org/codelibs/fess/mylasta/direction/FessPropTest.java | 2 +- src/test/java/org/codelibs/fess/query/QueryCommandTest.java | 2 +- src/test/java/org/codelibs/fess/query/QueryProcessorTest.java | 2 +- src/test/java/org/codelibs/fess/query/TermQueryCommandTest.java | 2 +- .../java/org/codelibs/fess/query/parser/QueryParserTest.java | 2 +- .../org/codelibs/fess/rank/fusion/RankFusionProcessorTest.java | 2 +- .../org/codelibs/fess/sso/aad/AzureAdAuthenticatorTest.java | 2 +- src/test/java/org/codelibs/fess/taglib/FessFunctionsTest.java | 2 +- .../codelibs/fess/thumbnail/impl/HtmlTagBasedGeneratorTest.java | 2 +- src/test/java/org/codelibs/fess/unit/UnitFessTestCase.java | 2 +- src/test/java/org/codelibs/fess/util/DocListTest.java | 2 +- src/test/java/org/codelibs/fess/util/DocMapTest.java | 2 +- src/test/java/org/codelibs/fess/util/DocumentUtilTest.java | 2 +- src/test/java/org/codelibs/fess/util/GsaConfigParserTest.java | 2 +- src/test/java/org/codelibs/fess/util/JvmUtilTest.java | 2 +- src/test/java/org/codelibs/fess/util/KuromojiCSVUtilTest.java | 2 +- src/test/java/org/codelibs/fess/util/MemoryUtilTest.java | 2 +- src/test/java/org/codelibs/fess/util/ParameterUtilTest.java | 2 +- src/test/java/org/codelibs/fess/util/PrunedTagTest.java | 2 +- src/test/java/org/codelibs/fess/util/QueryResponseListTest.java | 2 +- .../java/org/codelibs/fess/util/QueryStringBuilderTest.java | 2 +- src/test/java/org/codelibs/fess/util/RenderDataUtilTest.java | 2 +- src/test/java/org/codelibs/fess/util/ResourceUtilTest.java | 2 +- .../java/org/codelibs/fess/validation/UriTypeValidatorTest.java | 2 +- 1167 files changed, 1167 insertions(+), 1167 deletions(-) diff --git a/src/main/java/org/codelibs/fess/Constants.java b/src/main/java/org/codelibs/fess/Constants.java index 06ea8c475e..09abe30646 100644 --- a/src/main/java/org/codelibs/fess/Constants.java +++ b/src/main/java/org/codelibs/fess/Constants.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/FessBoot.java b/src/main/java/org/codelibs/fess/FessBoot.java index e5dcaad874..1050d79de9 100644 --- a/src/main/java/org/codelibs/fess/FessBoot.java +++ b/src/main/java/org/codelibs/fess/FessBoot.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/annotation/Secured.java b/src/main/java/org/codelibs/fess/annotation/Secured.java index 49c81a035b..a8aa06c0e0 100644 --- a/src/main/java/org/codelibs/fess/annotation/Secured.java +++ b/src/main/java/org/codelibs/fess/annotation/Secured.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/api/BaseApiManager.java b/src/main/java/org/codelibs/fess/api/BaseApiManager.java index 2b3088173a..0383f7db70 100644 --- a/src/main/java/org/codelibs/fess/api/BaseApiManager.java +++ b/src/main/java/org/codelibs/fess/api/BaseApiManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/api/WebApiManager.java b/src/main/java/org/codelibs/fess/api/WebApiManager.java index d61c91e15e..683d9083bd 100644 --- a/src/main/java/org/codelibs/fess/api/WebApiManager.java +++ b/src/main/java/org/codelibs/fess/api/WebApiManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/api/WebApiManagerFactory.java b/src/main/java/org/codelibs/fess/api/WebApiManagerFactory.java index e602815a98..1339090d68 100644 --- a/src/main/java/org/codelibs/fess/api/WebApiManagerFactory.java +++ b/src/main/java/org/codelibs/fess/api/WebApiManagerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/api/WebApiRequest.java b/src/main/java/org/codelibs/fess/api/WebApiRequest.java index 365c7f62b0..f34edd80d3 100644 --- a/src/main/java/org/codelibs/fess/api/WebApiRequest.java +++ b/src/main/java/org/codelibs/fess/api/WebApiRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/api/WebApiResponse.java b/src/main/java/org/codelibs/fess/api/WebApiResponse.java index 9cb761547e..0c687175b2 100644 --- a/src/main/java/org/codelibs/fess/api/WebApiResponse.java +++ b/src/main/java/org/codelibs/fess/api/WebApiResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/api/engine/SearchEngineApiManager.java b/src/main/java/org/codelibs/fess/api/engine/SearchEngineApiManager.java index 8ff13947d1..5674832da5 100644 --- a/src/main/java/org/codelibs/fess/api/engine/SearchEngineApiManager.java +++ b/src/main/java/org/codelibs/fess/api/engine/SearchEngineApiManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java b/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java index e086c8ec41..13d572cafb 100644 --- a/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java +++ b/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 06471d79b7..f48195c66e 100644 --- a/src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java +++ b/src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/job/ScriptExecutorJob.java b/src/main/java/org/codelibs/fess/app/job/ScriptExecutorJob.java index 9e2781eb7d..146be39df3 100644 --- a/src/main/java/org/codelibs/fess/app/job/ScriptExecutorJob.java +++ b/src/main/java/org/codelibs/fess/app/job/ScriptExecutorJob.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/logic/AccessContextLogic.java b/src/main/java/org/codelibs/fess/app/logic/AccessContextLogic.java index 067bf2cdf5..75b7a8e4ba 100644 --- a/src/main/java/org/codelibs/fess/app/logic/AccessContextLogic.java +++ b/src/main/java/org/codelibs/fess/app/logic/AccessContextLogic.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/AccessTokenPager.java b/src/main/java/org/codelibs/fess/app/pager/AccessTokenPager.java index 9887162566..1b352e9cef 100644 --- a/src/main/java/org/codelibs/fess/app/pager/AccessTokenPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/AccessTokenPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/BadWordPager.java b/src/main/java/org/codelibs/fess/app/pager/BadWordPager.java index 91feafc77f..4146eee10c 100644 --- a/src/main/java/org/codelibs/fess/app/pager/BadWordPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/BadWordPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/BoostDocPager.java b/src/main/java/org/codelibs/fess/app/pager/BoostDocPager.java index 6c785ea167..cd342c6a89 100644 --- a/src/main/java/org/codelibs/fess/app/pager/BoostDocPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/BoostDocPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/CharMappingPager.java b/src/main/java/org/codelibs/fess/app/pager/CharMappingPager.java index 562c906f64..a83c2f2198 100644 --- a/src/main/java/org/codelibs/fess/app/pager/CharMappingPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/CharMappingPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/CrawlingInfoPager.java b/src/main/java/org/codelibs/fess/app/pager/CrawlingInfoPager.java index a2be3841b0..ffb9e0f54a 100644 --- a/src/main/java/org/codelibs/fess/app/pager/CrawlingInfoPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/CrawlingInfoPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/DataConfigPager.java b/src/main/java/org/codelibs/fess/app/pager/DataConfigPager.java index 7dcd95be03..c2d822339f 100644 --- a/src/main/java/org/codelibs/fess/app/pager/DataConfigPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/DataConfigPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/DuplicateHostPager.java b/src/main/java/org/codelibs/fess/app/pager/DuplicateHostPager.java index 4c658de5b3..1dbc56b20f 100644 --- a/src/main/java/org/codelibs/fess/app/pager/DuplicateHostPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/DuplicateHostPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/ElevateWordPager.java b/src/main/java/org/codelibs/fess/app/pager/ElevateWordPager.java index ce2efd1331..345f34ed59 100644 --- a/src/main/java/org/codelibs/fess/app/pager/ElevateWordPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/ElevateWordPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/FailureUrlPager.java b/src/main/java/org/codelibs/fess/app/pager/FailureUrlPager.java index 97d444e6dc..4d846a87a9 100644 --- a/src/main/java/org/codelibs/fess/app/pager/FailureUrlPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/FailureUrlPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/FileAuthPager.java b/src/main/java/org/codelibs/fess/app/pager/FileAuthPager.java index 5ed8b81883..66fca53cde 100644 --- a/src/main/java/org/codelibs/fess/app/pager/FileAuthPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/FileAuthPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/FileConfigPager.java b/src/main/java/org/codelibs/fess/app/pager/FileConfigPager.java index 447526044c..e4f1b1e5a8 100644 --- a/src/main/java/org/codelibs/fess/app/pager/FileConfigPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/FileConfigPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/GroupPager.java b/src/main/java/org/codelibs/fess/app/pager/GroupPager.java index 170d4a854c..945509f6a7 100644 --- a/src/main/java/org/codelibs/fess/app/pager/GroupPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/GroupPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/JobLogPager.java b/src/main/java/org/codelibs/fess/app/pager/JobLogPager.java index 89531968dd..715f8a8aea 100644 --- a/src/main/java/org/codelibs/fess/app/pager/JobLogPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/JobLogPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/KeyMatchPager.java b/src/main/java/org/codelibs/fess/app/pager/KeyMatchPager.java index 9be7b7e3de..783eba8e18 100644 --- a/src/main/java/org/codelibs/fess/app/pager/KeyMatchPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/KeyMatchPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/KuromojiPager.java b/src/main/java/org/codelibs/fess/app/pager/KuromojiPager.java index 0076b5994c..d7ced31098 100644 --- a/src/main/java/org/codelibs/fess/app/pager/KuromojiPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/KuromojiPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/LabelTypePager.java b/src/main/java/org/codelibs/fess/app/pager/LabelTypePager.java index 3621f0ed74..e7de5154a7 100644 --- a/src/main/java/org/codelibs/fess/app/pager/LabelTypePager.java +++ b/src/main/java/org/codelibs/fess/app/pager/LabelTypePager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/PathMapPager.java b/src/main/java/org/codelibs/fess/app/pager/PathMapPager.java index 7615c114ae..ee38a34c14 100644 --- a/src/main/java/org/codelibs/fess/app/pager/PathMapPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/PathMapPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/ProtwordsPager.java b/src/main/java/org/codelibs/fess/app/pager/ProtwordsPager.java index a6c9a7a1cc..125b16d1f2 100644 --- a/src/main/java/org/codelibs/fess/app/pager/ProtwordsPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/ProtwordsPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/RelatedContentPager.java b/src/main/java/org/codelibs/fess/app/pager/RelatedContentPager.java index 1fb1ca2538..77b01edf8e 100644 --- a/src/main/java/org/codelibs/fess/app/pager/RelatedContentPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/RelatedContentPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/RelatedQueryPager.java b/src/main/java/org/codelibs/fess/app/pager/RelatedQueryPager.java index f539709876..e50df4dfa5 100644 --- a/src/main/java/org/codelibs/fess/app/pager/RelatedQueryPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/RelatedQueryPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/ReqHeaderPager.java b/src/main/java/org/codelibs/fess/app/pager/ReqHeaderPager.java index 48413d9c81..b5ded1ce3d 100644 --- a/src/main/java/org/codelibs/fess/app/pager/ReqHeaderPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/ReqHeaderPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/RolePager.java b/src/main/java/org/codelibs/fess/app/pager/RolePager.java index b11a67c061..f872d14c2b 100644 --- a/src/main/java/org/codelibs/fess/app/pager/RolePager.java +++ b/src/main/java/org/codelibs/fess/app/pager/RolePager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/RoleTypePager.java b/src/main/java/org/codelibs/fess/app/pager/RoleTypePager.java index 2e0c0ad8e4..4cf182c50a 100644 --- a/src/main/java/org/codelibs/fess/app/pager/RoleTypePager.java +++ b/src/main/java/org/codelibs/fess/app/pager/RoleTypePager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/SchedulerPager.java b/src/main/java/org/codelibs/fess/app/pager/SchedulerPager.java index 152b352123..e360057f2f 100644 --- a/src/main/java/org/codelibs/fess/app/pager/SchedulerPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/SchedulerPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/SearchLogPager.java b/src/main/java/org/codelibs/fess/app/pager/SearchLogPager.java index 1c14e04600..33c59e38b6 100644 --- a/src/main/java/org/codelibs/fess/app/pager/SearchLogPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/SearchLogPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/StemmerOverridePager.java b/src/main/java/org/codelibs/fess/app/pager/StemmerOverridePager.java index d02e248a2a..ddbcb50412 100644 --- a/src/main/java/org/codelibs/fess/app/pager/StemmerOverridePager.java +++ b/src/main/java/org/codelibs/fess/app/pager/StemmerOverridePager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/StopwordsPager.java b/src/main/java/org/codelibs/fess/app/pager/StopwordsPager.java index 0d7f120680..a1f704bc93 100644 --- a/src/main/java/org/codelibs/fess/app/pager/StopwordsPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/StopwordsPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/SynonymPager.java b/src/main/java/org/codelibs/fess/app/pager/SynonymPager.java index a28df48c78..36cc668d0a 100644 --- a/src/main/java/org/codelibs/fess/app/pager/SynonymPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/SynonymPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/UserPager.java b/src/main/java/org/codelibs/fess/app/pager/UserPager.java index cb34461608..9918c4881e 100644 --- a/src/main/java/org/codelibs/fess/app/pager/UserPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/UserPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/WebAuthPager.java b/src/main/java/org/codelibs/fess/app/pager/WebAuthPager.java index beed97a92b..267731f6a4 100644 --- a/src/main/java/org/codelibs/fess/app/pager/WebAuthPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/WebAuthPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/pager/WebConfigPager.java b/src/main/java/org/codelibs/fess/app/pager/WebConfigPager.java index 8ea083ca55..b8651755b3 100644 --- a/src/main/java/org/codelibs/fess/app/pager/WebConfigPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/WebConfigPager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 d729fd019f..3a19fdfcf3 100644 --- a/src/main/java/org/codelibs/fess/app/service/AccessTokenService.java +++ b/src/main/java/org/codelibs/fess/app/service/AccessTokenService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 e874dfc9e0..ff4a60b746 100644 --- a/src/main/java/org/codelibs/fess/app/service/BadWordService.java +++ b/src/main/java/org/codelibs/fess/app/service/BadWordService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 65c5e2b6a2..f12caeb01b 100644 --- a/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java +++ b/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 312c635df2..21bc794766 100644 --- a/src/main/java/org/codelibs/fess/app/service/CharMappingService.java +++ b/src/main/java/org/codelibs/fess/app/service/CharMappingService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 e1e893aac5..2f3c861c68 100644 --- a/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java +++ b/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/service/DataConfigService.java b/src/main/java/org/codelibs/fess/app/service/DataConfigService.java index 594aa23ae5..9d449ad1a5 100644 --- a/src/main/java/org/codelibs/fess/app/service/DataConfigService.java +++ b/src/main/java/org/codelibs/fess/app/service/DataConfigService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java b/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java index 2a8ae5ee83..3507496bfb 100644 --- a/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java +++ b/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 55a16987b8..5715e14f0e 100644 --- a/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java +++ b/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java b/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java index eef0bd46c1..d05fd59f71 100644 --- a/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java +++ b/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java b/src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java index cf4ea19ab8..82772f688b 100644 --- a/src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java +++ b/src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/service/FessAppService.java b/src/main/java/org/codelibs/fess/app/service/FessAppService.java index ec0bf3f162..9b73b4723b 100644 --- a/src/main/java/org/codelibs/fess/app/service/FessAppService.java +++ b/src/main/java/org/codelibs/fess/app/service/FessAppService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java b/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java index e5ba034685..7fcae7db25 100644 --- a/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java +++ b/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/service/FileConfigService.java b/src/main/java/org/codelibs/fess/app/service/FileConfigService.java index 72ac381899..5817ef62e2 100644 --- a/src/main/java/org/codelibs/fess/app/service/FileConfigService.java +++ b/src/main/java/org/codelibs/fess/app/service/FileConfigService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 28a72d0187..94a3225fd8 100644 --- a/src/main/java/org/codelibs/fess/app/service/GroupService.java +++ b/src/main/java/org/codelibs/fess/app/service/GroupService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/service/JobLogService.java b/src/main/java/org/codelibs/fess/app/service/JobLogService.java index be153ed3ae..4a5295af00 100644 --- a/src/main/java/org/codelibs/fess/app/service/JobLogService.java +++ b/src/main/java/org/codelibs/fess/app/service/JobLogService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java b/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java index 4b0aa16bdb..b0ead562d2 100644 --- a/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java +++ b/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 eb75200990..297e3929de 100644 --- a/src/main/java/org/codelibs/fess/app/service/KuromojiService.java +++ b/src/main/java/org/codelibs/fess/app/service/KuromojiService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java b/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java index 5cd2194060..148584f672 100644 --- a/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java +++ b/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/service/PathMappingService.java b/src/main/java/org/codelibs/fess/app/service/PathMappingService.java index dde24b4915..19b9effb68 100644 --- a/src/main/java/org/codelibs/fess/app/service/PathMappingService.java +++ b/src/main/java/org/codelibs/fess/app/service/PathMappingService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 8386893035..78d5c3f2bb 100644 --- a/src/main/java/org/codelibs/fess/app/service/ProtwordsService.java +++ b/src/main/java/org/codelibs/fess/app/service/ProtwordsService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 a512e52411..b2dfb34af5 100644 --- a/src/main/java/org/codelibs/fess/app/service/RelatedContentService.java +++ b/src/main/java/org/codelibs/fess/app/service/RelatedContentService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 7ee8e11d07..386284a77f 100644 --- a/src/main/java/org/codelibs/fess/app/service/RelatedQueryService.java +++ b/src/main/java/org/codelibs/fess/app/service/RelatedQueryService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java b/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java index de7707e78d..f4f759a7c7 100644 --- a/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java +++ b/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 f40183f0ef..cbe8d9a2b2 100644 --- a/src/main/java/org/codelibs/fess/app/service/RoleService.java +++ b/src/main/java/org/codelibs/fess/app/service/RoleService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java b/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java index 30af839df9..733f41402c 100644 --- a/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java +++ b/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java b/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java index d8daec1e52..4ebf4e077d 100644 --- a/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java +++ b/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/service/SearchLogService.java b/src/main/java/org/codelibs/fess/app/service/SearchLogService.java index 1202f0ac44..1874f53cef 100644 --- a/src/main/java/org/codelibs/fess/app/service/SearchLogService.java +++ b/src/main/java/org/codelibs/fess/app/service/SearchLogService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 651831bc8d..41ef9437d1 100644 --- a/src/main/java/org/codelibs/fess/app/service/StemmerOverrideService.java +++ b/src/main/java/org/codelibs/fess/app/service/StemmerOverrideService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 6a1f34c311..2578b3267c 100644 --- a/src/main/java/org/codelibs/fess/app/service/StopwordsService.java +++ b/src/main/java/org/codelibs/fess/app/service/StopwordsService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 d4a0d4bea8..92a771921a 100644 --- a/src/main/java/org/codelibs/fess/app/service/SynonymService.java +++ b/src/main/java/org/codelibs/fess/app/service/SynonymService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/service/UserInfoService.java b/src/main/java/org/codelibs/fess/app/service/UserInfoService.java index 1adfc635ce..9b0c3f7f26 100644 --- a/src/main/java/org/codelibs/fess/app/service/UserInfoService.java +++ b/src/main/java/org/codelibs/fess/app/service/UserInfoService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/service/UserService.java b/src/main/java/org/codelibs/fess/app/service/UserService.java index ea438c657c..28b54539c3 100644 --- a/src/main/java/org/codelibs/fess/app/service/UserService.java +++ b/src/main/java/org/codelibs/fess/app/service/UserService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java b/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java index 59eafd29c3..f5b3688688 100644 --- a/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java +++ b/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/service/WebConfigService.java b/src/main/java/org/codelibs/fess/app/service/WebConfigService.java index 5dffc1502d..3af2ea858d 100644 --- a/src/main/java/org/codelibs/fess/app/service/WebConfigService.java +++ b/src/main/java/org/codelibs/fess/app/service/WebConfigService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/CrudMode.java b/src/main/java/org/codelibs/fess/app/web/CrudMode.java index d7a1e7ca8e..f4d7ccd78b 100644 --- a/src/main/java/org/codelibs/fess/app/web/CrudMode.java +++ b/src/main/java/org/codelibs/fess/app/web/CrudMode.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/RootAction.java b/src/main/java/org/codelibs/fess/app/web/RootAction.java index 43f45a8382..35694f7fd9 100644 --- a/src/main/java/org/codelibs/fess/app/web/RootAction.java +++ b/src/main/java/org/codelibs/fess/app/web/RootAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 a1a1077356..46be6a5660 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 683f927407..d0454972be 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/CreateForm.java index abf4494aff..ac7a53b71a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/EditForm.java index 13297492db..e4f30984f8 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/SearchForm.java index f448ebe89f..07179ccee2 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/accesstoken/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 bb02621971..357be1de29 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/backup/UploadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/backup/UploadForm.java index d022e92938..570cf0fdcc 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/backup/UploadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/backup/UploadForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 cacf40b0ee..afff7e9ea5 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/badword/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/badword/CreateForm.java index 9015fb8810..fa9ea8fc56 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/badword/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/badword/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/badword/DownloadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/badword/DownloadForm.java index e6da822f36..cd16483353 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/badword/DownloadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/badword/DownloadForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/badword/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/badword/EditForm.java index 104ff54397..deb4c18271 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/badword/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/badword/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/badword/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/badword/SearchForm.java index f533562762..6456e3760d 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/badword/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/badword/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/badword/UploadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/badword/UploadForm.java index b962fe4bcd..fbdae35831 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/badword/UploadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/badword/UploadForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 774917aa08..ebbb98bdd4 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/CreateForm.java index f335f89a3a..38f131d442 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/EditForm.java index 65e716cb74..44bb018d7f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/SearchForm.java index 059d7d7d0a..670069eda0 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 323f0e5448..5d194492ca 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/EditForm.java index e1ebb1b256..75a5883e00 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/SearchForm.java index ada4ef2009..a8539d000f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java index 5961cc9746..e9384a6494 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 035931ac86..e91ca767e4 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java index e9379afcde..95c09e293d 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/EditForm.java index 3113ba8a6e..9d767dce43 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/SearchForm.java index 0a07711992..f7af0002dd 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java b/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java index ef13faff79..05177e8184 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/design/DesignForm.java b/src/main/java/org/codelibs/fess/app/web/admin/design/DesignForm.java index fa99b17f01..4507fc87e5 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/design/DesignForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/design/DesignForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/design/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/design/EditForm.java index 9fa08b72df..e0ec1563d2 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/design/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/design/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/design/FileAccessForm.java b/src/main/java/org/codelibs/fess/app/web/admin/design/FileAccessForm.java index 9fc9e23ca1..c5fda34411 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/design/FileAccessForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/design/FileAccessForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/design/UploadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/design/UploadForm.java index 44d24087db..701e8bb8a5 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/design/UploadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/design/UploadForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/AdminDictAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/AdminDictAction.java index 24458cd890..37400e035a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/AdminDictAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/AdminDictAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/ListForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/ListForm.java index 9d3abb9d2e..4f8261d72c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/ListForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/ListForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 dc6e385660..d1638d24d9 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/CreateForm.java index d396bdb63a..4a9aaac453 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/DownloadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/DownloadForm.java index cfb1e70ccc..3f19f32497 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/DownloadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/DownloadForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/EditForm.java index e8fcaf6233..d44af4b5df 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/SearchForm.java index 1f39d5511d..eb8153b7db 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/UploadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/UploadForm.java index 2d63030cf4..88ac6eb6f3 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/UploadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/UploadForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 5de0e57281..58702d30b3 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/CreateForm.java index 5f4177b638..da8f02504a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/DownloadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/DownloadForm.java index e564d6cd59..6538f14655 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/DownloadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/DownloadForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/EditForm.java index 26cf3ea08a..36aedbed95 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/SearchForm.java index e2ed570712..126f76bc01 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/UploadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/UploadForm.java index 61e3990789..91a6d60413 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/UploadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/UploadForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 266d49681f..c13bd5cfba 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/CreateForm.java index 94bc6e2669..3b493c1b63 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/DownloadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/DownloadForm.java index 04cfa33cfa..8f068f5fef 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/DownloadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/DownloadForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/EditForm.java index c8343e9c6b..1b0417e3cd 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/SearchForm.java index 09ce18b0cb..769d708345 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/UploadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/UploadForm.java index 6105f76e81..be19fe6f39 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/UploadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/UploadForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 196f7ba667..f8fd16babc 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/CreateForm.java index 9d00a81a12..9bf110f703 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/DownloadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/DownloadForm.java index 7cff38f9fc..fce8781050 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/DownloadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/DownloadForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/EditForm.java index 07178813f2..1f0328b38a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/SearchForm.java index 24e86e5df3..d9bbea5a26 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/UploadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/UploadForm.java index fcbe5756d4..c93468ed8d 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/UploadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/UploadForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 956fc3d784..b6f20a931f 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/CreateForm.java index 9f2d155b7d..9e4ff704f8 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/DownloadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/DownloadForm.java index def52411ae..97bfe2867d 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/DownloadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/DownloadForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/EditForm.java index f375db0980..0d0751085b 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/SearchForm.java index 55627ea896..f1126bcdd1 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/UploadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/UploadForm.java index 6ed44873ab..61fab05a38 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/UploadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/UploadForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 e388774296..23847e9120 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/CreateForm.java index 52480f22dc..0565f864bd 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/DownloadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/DownloadForm.java index 0978f1d9fe..3f14012c7a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/DownloadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/DownloadForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/EditForm.java index 05af250bc5..86e5e28261 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/SearchForm.java index b72298d3dd..587351d98b 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/UploadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/UploadForm.java index b41ff1a487..f61b917d90 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/UploadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/UploadForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 528654694f..e5f02506cd 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/CreateForm.java index 8cb42b2484..8125bc680b 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/EditForm.java index 4a6277aa62..edfe78abea 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/SearchForm.java index 422869fb7b..b2d820e306 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 0b4ad37cb8..f7d0e75726 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/CreateForm.java index ef1ce0a75e..edc1e1d47a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/DownloadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/DownloadForm.java index b196179f22..5d7ac208af 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/DownloadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/DownloadForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/EditForm.java index e9f97ef4c4..65f882bd1f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/SearchForm.java index 171934f4e5..cb542fcc1a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/UploadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/UploadForm.java index e10d543295..a13f1b4924 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/UploadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/UploadForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.java b/src/main/java/org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.java index 5535bcf6e5..a9d607a6d4 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/esreq/AdminEsreqAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/esreq/UploadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/esreq/UploadForm.java index 0fc06e66e4..d767249703 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/esreq/UploadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/esreq/UploadForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 f68d7e8408..fa20bd4d72 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/failureurl/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/failureurl/EditForm.java index 89b29a9463..57da389132 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/failureurl/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/failureurl/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/failureurl/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/failureurl/SearchForm.java index 171c033b88..ba1a0543a5 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/failureurl/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/failureurl/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 0016a5f880..6980b68ac3 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/CreateForm.java index 98ed62988c..7f09947553 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/EditForm.java index 6e9cbccfd0..86597da72f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/SearchForm.java index c7b6f6ca46..7196bd004b 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 58431da1cb..cca074e015 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java index 74385929c5..fa2c73b900 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/EditForm.java index b89b107497..955fa4c6ec 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/SearchForm.java index 80b2acdb9c..009700e450 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java b/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java index d380ca6723..9c3b7e3687 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java index 2f55e3b96c..96d31ffd75 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/general/MailForm.java b/src/main/java/org/codelibs/fess/app/web/admin/general/MailForm.java index 35633c1ffc..6ae359e314 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/general/MailForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/general/MailForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 d70760c523..58cbde3301 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/group/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/group/CreateForm.java index 780f20367b..8783f8800f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/group/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/group/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/group/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/group/EditForm.java index 92de782029..c1ba7b5689 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/group/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/group/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/group/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/group/SearchForm.java index 1a915c5a20..4952feedaa 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/group/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/group/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 08cd429c34..c36cb6a681 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/joblog/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/joblog/EditForm.java index 2f30ff787e..0803e35803 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/joblog/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/joblog/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/joblog/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/joblog/SearchForm.java index 7e57a7a177..989c44c3af 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/joblog/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/joblog/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 c4ab19169f..19777fbf85 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/CreateForm.java index df3815b4eb..531f2b7f10 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/EditForm.java index 56ad67e53e..9e59292657 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/SearchForm.java index d9d2c80d66..490bf17bde 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 95280fc2d8..f63cc09a9d 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/CreateForm.java index dcad640dd0..5c792e1c5a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/EditForm.java index 2a79b8a8ba..8e90623969 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/SearchForm.java index 181936391a..76d8c6dbaf 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/log/AdminLogAction.java b/src/main/java/org/codelibs/fess/app/web/admin/log/AdminLogAction.java index 4e2b9e5ef4..86af29ab93 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/log/AdminLogAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/log/AdminLogAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/maintenance/ActionForm.java b/src/main/java/org/codelibs/fess/app/web/admin/maintenance/ActionForm.java index 7bdf42a535..ec89edb709 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/maintenance/ActionForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/maintenance/ActionForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 f899405165..5842b7d3cc 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 7be3b130da..b2f5ee7941 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/CreateForm.java index 8be1ae183d..de72e3b031 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/EditForm.java index f477d2124c..8b5b41fc08 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/SearchForm.java index 1ed939b5ac..7726bb6a79 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 f8d870ae40..fdd25bbe33 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/plugin/DeleteForm.java b/src/main/java/org/codelibs/fess/app/web/admin/plugin/DeleteForm.java index 0da40d8bfe..a0e2340624 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/plugin/DeleteForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/plugin/DeleteForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/plugin/InstallForm.java b/src/main/java/org/codelibs/fess/app/web/admin/plugin/InstallForm.java index b0510be4f8..303d11444c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/plugin/InstallForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/plugin/InstallForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 88a65f9859..afb34e2177 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/CreateForm.java index 14246ac617..5645bb777b 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/EditForm.java index ecee350fae..d6bc74d81c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/SearchForm.java index 030b818f60..94b7a1624d 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 890ecd251c..40128e700c 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/CreateForm.java index 32b8a7936c..81b12842eb 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/EditForm.java index a19a8920fb..0cc86b0915 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/SearchForm.java index 4489e7b658..f003997afd 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/relatedquery/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 c14c9ad9c4..b157370b2f 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/CreateForm.java index cea16a1728..b7ee565e87 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/EditForm.java index 0544bf3f16..fb534f7d9e 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/SearchForm.java index 30e29b9d55..10b477d672 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 a4fd15fb3b..471a9dc5fd 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/role/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/role/CreateForm.java index a522743938..52f9fabb66 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/role/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/role/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/role/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/role/EditForm.java index 741dc97663..29468eab33 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/role/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/role/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/role/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/role/SearchForm.java index 584d151055..af5cc93a29 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/role/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/role/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 36dfc8b768..9b9c6ac4e1 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/CreateForm.java index d6395e050f..fa5401e66a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/EditForm.java index 2c1adab281..70f5fba1d3 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/SearchForm.java index 76daf2c70e..ff2394fc13 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 ac81ed2c1e..94507978b4 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/CreateForm.java index b54bd4a7ea..3f9befb87e 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/DeleteForm.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/DeleteForm.java index 7a5152e259..169b366a0c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/DeleteForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/DeleteForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/EditForm.java index ebc10fa128..d39d344a36 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java index 6effc87caf..20bae79362 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/ListForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 3963646da9..d362245f56 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlog/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlog/EditForm.java index f02ffb0995..dcc689af78 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/searchlog/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlog/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlog/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlog/SearchForm.java index a3c8c15c33..02aeb0c03a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/searchlog/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlog/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 456b747ec6..4695196cb6 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/storage/ItemForm.java b/src/main/java/org/codelibs/fess/app/web/admin/storage/ItemForm.java index 8308b3fd7c..15431ad92f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/storage/ItemForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/storage/ItemForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/storage/TagForm.java b/src/main/java/org/codelibs/fess/app/web/admin/storage/TagForm.java index d31beb5f67..8626f243a9 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/storage/TagForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/storage/TagForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/suggest/AdminSuggestAction.java b/src/main/java/org/codelibs/fess/app/web/admin/suggest/AdminSuggestAction.java index 555b56b57a..847862d677 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/suggest/AdminSuggestAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/suggest/AdminSuggestAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/suggest/SuggestForm.java b/src/main/java/org/codelibs/fess/app/web/admin/suggest/SuggestForm.java index 09e7dbccc3..73ecb03486 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/suggest/SuggestForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/suggest/SuggestForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 0184cac20d..8913365aa3 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 2540b51204..914d6c3396 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/UpgradeForm.java b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/UpgradeForm.java index 41909f6880..e763a3e3c2 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/UpgradeForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/UpgradeForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 acb24fa6ee..85d2b7c4dd 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/user/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/user/CreateForm.java index ce19f8413d..389092c414 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/user/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/user/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/user/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/user/EditForm.java index 3c528d7d3b..68f1332904 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/user/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/user/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/user/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/user/SearchForm.java index 48b169fb66..b43477b2ce 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/user/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/user/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 8faa82b4cd..3f71bb9d18 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webauth/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/webauth/CreateForm.java index e65bb56919..1db9d4f6cb 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webauth/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webauth/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webauth/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/webauth/EditForm.java index e117ccad4b..4f2b19d280 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webauth/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webauth/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webauth/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/webauth/SearchForm.java index 3300c7bfbe..44cd84b9f3 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webauth/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webauth/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 91fae521f3..2925b6bb81 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/CreateForm.java index 49e665480d..5551b7cdc1 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/CreateForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/CreateForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/EditForm.java index c02d3ea301..bd6950239e 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/EditForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/SearchForm.java index d6eb589e91..659d51543f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java b/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java index 1feb76be85..e97f601f0c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/wizard/CrawlingConfigForm.java b/src/main/java/org/codelibs/fess/app/web/admin/wizard/CrawlingConfigForm.java index a0f8e7f4ed..5d859c248c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/wizard/CrawlingConfigForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/wizard/CrawlingConfigForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/wizard/IndexForm.java b/src/main/java/org/codelibs/fess/app/web/admin/wizard/IndexForm.java index c4bd00e64f..59fd791daa 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/wizard/IndexForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/wizard/IndexForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/wizard/StartCrawlingForm.java b/src/main/java/org/codelibs/fess/app/web/admin/wizard/StartCrawlingForm.java index 3016ffb5fd..efc6e55af7 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/wizard/StartCrawlingForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/wizard/StartCrawlingForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 6bce532de4..2d6145f823 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/FessApiAction.java b/src/main/java/org/codelibs/fess/app/web/api/FessApiAction.java index a62f35d404..86bedb6561 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/FessApiAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/FessApiAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/BaseSearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/BaseSearchBody.java index 9f76e23995..2dfb575946 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/BaseSearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/BaseSearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/FessApiAdminAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/FessApiAdminAction.java index d5a23ea61c..f832370555 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/FessApiAdminAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/FessApiAdminAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 8d19003e55..ea0a20c89e 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/CreateBody.java index f35b293248..b3f7c8a421 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/EditBody.java index 4fb7afe5cf..3064ba8218 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/SearchBody.java index 89bd164dd6..1e1dbbb53e 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 13ce599088..b373f1a0dc 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 5dc7d8fc0d..7040de405e 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/badword/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/badword/CreateBody.java index 77b8e65905..45ba42772e 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/badword/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/badword/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/badword/DownloadBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/badword/DownloadBody.java index a61adc7e8b..4b3e536afc 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/badword/DownloadBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/badword/DownloadBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/badword/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/badword/EditBody.java index 064606d0b7..fe8833f6ec 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/badword/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/badword/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/badword/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/badword/SearchBody.java index 27d9ae9f61..a0b4f60afb 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/badword/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/badword/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java index 03307d0259..17404cf8e7 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/CreateBody.java index 41b9a1b6cb..e1e801614a 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/EditBody.java index db73aa1d43..4e3ee32854 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/SearchBody.java index 927a4f6143..7d3a6eae82 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java index ee0307569f..459e21ea88 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/EditBody.java index d3bcfb2575..1d67f0a121 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/SearchBody.java index 6f444e051f..46862e5ed4 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 767249b2d7..c6a0d2390d 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/CreateBody.java index a4f859ef76..f894a7e3d6 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/EditBody.java index a7ff452df6..06987600fb 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/SearchBody.java index 284fb81016..6afa1aec5e 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 5e19ac2400..3c3865fef2 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/BaseSearchDictBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/BaseSearchDictBody.java index be8072024e..43a3901855 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/BaseSearchDictBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/BaseSearchDictBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/ListBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/ListBody.java index 75482a6154..3023d8810b 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/ListBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/ListBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 72ae47365a..07892eddfc 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/CreateBody.java index 85398f25a0..4592ca74eb 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/DownloadBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/DownloadBody.java index 9fc9bf51a0..cad41ba873 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/DownloadBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/DownloadBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/EditBody.java index 7e35bcce28..63218bc22e 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/SearchBody.java index dc7f35821d..8462a12360 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 b14aae8f2b..678209b706 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/CreateBody.java index 98991d123b..413d2c5a10 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/DownloadBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/DownloadBody.java index 0caf941c21..b24d8ac90b 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/DownloadBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/DownloadBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/EditBody.java index 8f0d47927c..909e315375 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/SearchBody.java index 09927e9e4b..065605a7bd 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 5066a2e7b6..7b4e38483a 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/CreateBody.java index ec241657cf..e05fc17a6d 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/DownloadBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/DownloadBody.java index 0361c23e51..ff364e48bd 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/DownloadBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/DownloadBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/EditBody.java index 6bd93178e5..08e0c5407c 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/SearchBody.java index 9c7ceefb91..cf14f7eb65 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 2c6a3d085c..99d4fc027a 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stemmeroverride/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stemmeroverride/CreateBody.java index ed0122fea3..3700fda98e 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stemmeroverride/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stemmeroverride/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stemmeroverride/DownloadBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stemmeroverride/DownloadBody.java index e55a7d0175..073d23b3e6 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stemmeroverride/DownloadBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stemmeroverride/DownloadBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stemmeroverride/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stemmeroverride/EditBody.java index 43315184e8..5ebc1af83b 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stemmeroverride/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stemmeroverride/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stemmeroverride/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stemmeroverride/SearchBody.java index 1e25be65ef..a411cbeec2 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stemmeroverride/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stemmeroverride/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 fca699985a..5a69ed7aaa 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stopwords/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stopwords/CreateBody.java index 4e5f53fb79..c1980a976d 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stopwords/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stopwords/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stopwords/DownloadBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stopwords/DownloadBody.java index 202f5c6e2d..31947b0c33 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stopwords/DownloadBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stopwords/DownloadBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stopwords/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stopwords/EditBody.java index bc538a2488..35b4fb1367 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stopwords/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stopwords/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stopwords/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stopwords/SearchBody.java index 5e84173958..eb91c5a622 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stopwords/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/stopwords/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 44981607f9..db2e6664d5 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/CreateBody.java index 881338cfda..1ff67c5eca 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/DownloadBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/DownloadBody.java index 4730abd1d2..bb74ff6b58 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/DownloadBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/DownloadBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/EditBody.java index 5d2cc06d19..11c1377331 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/SearchBody.java index 9ec8414df2..fd5ebbdcea 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 0f09fa52fe..487cd4e124 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/CreateBody.java index 894b6aea68..f712a3d5f2 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/EditBody.java index 9fbe18b66d..a89dba8ad0 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/SearchBody.java index e98c49e5d5..46a402d59b 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 31c69c674e..e9adcf689e 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/CreateBody.java index 5a03703374..bff360a3be 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/DownloadBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/DownloadBody.java index 35fb9964a8..5edc290a93 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/DownloadBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/DownloadBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/EditBody.java index 9d13f9e24f..ca8b509c19 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/SearchBody.java index a462421416..7cf8ee5e64 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java index a29b2b9b51..0641cd2f4a 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/EditBody.java index e16ca649fe..78956cb1af 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/SearchBody.java index c0de83a58c..956a1b5327 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 7151c13639..f33322596b 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/CreateBody.java index 3a287721fc..c83a8889d5 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/EditBody.java index 10ad431b6d..b7c2c87d78 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/SearchBody.java index 6d7d6c1ec2..680925a684 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 238ba2bf56..e64e242cd7 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/CreateBody.java index 9dcee10353..2554d25de7 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/EditBody.java index 68d3227a5b..daf5e7e113 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/SearchBody.java index becf3c0893..27f440f421 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/general/ApiAdminGeneralAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/general/ApiAdminGeneralAction.java index da99a0081b..e1a8a22295 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/general/ApiAdminGeneralAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/general/ApiAdminGeneralAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/general/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/general/EditBody.java index 0151c4a157..47997f4c5c 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/general/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/general/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 5c49c566be..602c4633a9 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/group/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/group/CreateBody.java index 8362960fc6..72a5687c3d 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/group/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/group/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/group/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/group/EditBody.java index 7eebbed8d2..9f2a69aca8 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/group/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/group/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/group/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/group/SearchBody.java index f9f703bacd..e92d4a7733 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/group/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/group/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java index ab774f3f41..52e26d6d44 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/EditBody.java index 1cd8b762d0..985d65517d 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/SearchBody.java index 2a8388ab78..20182b2b0c 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 9f7d726c8f..ff87ac9e7e 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/CreateBody.java index ed520efb93..2633bed8c2 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/EditBody.java index a222a3b2d2..b12a988551 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/SearchBody.java index 7b503febac..ff8a0b347e 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 27323b4c9b..c4556735db 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/CreateBody.java index f1a3ad3942..7e6bba1eca 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/EditBody.java index cb433b87da..d083ebaaa2 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/SearchBody.java index e78d72d9b0..6868db6079 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/log/ApiAdminLogAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/log/ApiAdminLogAction.java index c3cc6ba83b..1d42cd2cf4 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/log/ApiAdminLogAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/log/ApiAdminLogAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 ce65187180..53e9a204b4 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/CreateBody.java index 7ca2c6796e..e8febf37b0 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/EditBody.java index 8ea032a0e2..3032929cdb 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/SearchBody.java index 849467332f..b4a09b1cf1 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 cf31226b55..f4480bbbaa 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/plugin/DeleteBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/plugin/DeleteBody.java index e74d874062..a5995cf4b6 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/plugin/DeleteBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/plugin/DeleteBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/plugin/InstallBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/plugin/InstallBody.java index 00c3b9fc66..b66aa42629 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/plugin/InstallBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/plugin/InstallBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 75de03db56..3991c85674 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/CreateBody.java index 08a3f6068e..5c348cd225 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/EditBody.java index d1ed4313c0..6014c9e293 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/SearchBody.java index 9869c8ace1..9e34a63f05 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 79eebcd764..db4b46ccca 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/CreateBody.java index 5167e2d7ff..95e08adcfe 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/EditBody.java index 1327c1ce82..e3a9dd5792 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/SearchBody.java index 8ef6495437..118a0d7c2b 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 17e8354c7a..08434c813f 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/CreateBody.java index 862f29328e..fe2dc918d3 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/EditBody.java index e96160b2c7..545f0d9b14 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/SearchBody.java index 716dc7c3fd..1be186001f 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 4df25b4108..2c3fba7964 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/role/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/role/CreateBody.java index bdc153e587..e8665c9317 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/role/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/role/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/role/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/role/EditBody.java index bfe7bf61a7..def9d0a658 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/role/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/role/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/role/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/role/SearchBody.java index e3fa776039..efe2cb1479 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/role/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/role/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 0688d4db84..cacef5a9ba 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/CreateBody.java index 16e1d29b68..aa824e8f81 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/EditBody.java index a4c3a2881b..6aeaf6ce31 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/SearchBody.java index d56f9a0fd0..ffc03ec997 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 082f3fba1b..114f44b825 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/CreateBody.java index 503f0cfc50..ec54a715be 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/EditBody.java index 93185d8d32..daa23cb317 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/SearchBody.java index 744946aad5..2e11376ef2 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/stats/ApiAdminStatsAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/stats/ApiAdminStatsAction.java index 02bd3f7457..70f6ee0bb7 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/stats/ApiAdminStatsAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/stats/ApiAdminStatsAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/storage/ApiAdminStorageAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/storage/ApiAdminStorageAction.java index 8665fedca3..5723ec4514 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/storage/ApiAdminStorageAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/storage/ApiAdminStorageAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/storage/UploadForm.java b/src/main/java/org/codelibs/fess/app/web/api/admin/storage/UploadForm.java index 8485da7cb7..0aae4b0344 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/storage/UploadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/storage/UploadForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/suggest/ApiAdminSuggestAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/suggest/ApiAdminSuggestAction.java index dcd6e749a7..f836637b49 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/suggest/ApiAdminSuggestAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/suggest/ApiAdminSuggestAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/suggest/SuggestBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/suggest/SuggestBody.java index 15e74b71e4..063824e869 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/suggest/SuggestBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/suggest/SuggestBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/systeminfo/ApiAdminSysteminfoAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/systeminfo/ApiAdminSysteminfoAction.java index 1eb78b5da0..d25dc704f1 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/systeminfo/ApiAdminSysteminfoAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/systeminfo/ApiAdminSysteminfoAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 99c12d9f4b..df8873b012 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/user/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/user/CreateBody.java index c48b5fca74..c9d40321d0 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/user/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/user/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/user/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/user/EditBody.java index b536f9cf55..941a4e17a5 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/user/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/user/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/user/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/user/SearchBody.java index d2c7761030..fa33543dff 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/user/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/user/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 227b96a2a9..c1ed94b565 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/CreateBody.java index 4e4aea87a5..2ed6f7668c 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/EditBody.java index c6cb6dc5b2..a92d92a139 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/SearchBody.java index 306fe320cd..a60ca5b5a9 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 161f511716..5d9b0a0fb0 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/CreateBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/CreateBody.java index 7d1b98deb3..1b29408730 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/CreateBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/CreateBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/EditBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/EditBody.java index 6c81da9ab8..3e885d751e 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/EditBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/EditBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/SearchBody.java index 0368731502..f3ff7b244a 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/SearchBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 a3aa4fc046..8722b35150 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java b/src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java index 5dc34590c5..713fec365f 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java +++ b/src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/base/FessLoginAction.java b/src/main/java/org/codelibs/fess/app/web/base/FessLoginAction.java index f7b208715c..500a14a949 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/FessLoginAction.java +++ b/src/main/java/org/codelibs/fess/app/web/base/FessLoginAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 2e77cdeac6..647da63abb 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/base/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/base/SearchForm.java index 2f74c24f4a..18d750e5a2 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/base/SearchForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/base/login/ActionResponseCredential.java b/src/main/java/org/codelibs/fess/app/web/base/login/ActionResponseCredential.java index 6971a07ebf..a6a6333e78 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/login/ActionResponseCredential.java +++ b/src/main/java/org/codelibs/fess/app/web/base/login/ActionResponseCredential.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/base/login/AzureAdCredential.java b/src/main/java/org/codelibs/fess/app/web/base/login/AzureAdCredential.java index 3bc5c1a1b6..6c34ebaad1 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/login/AzureAdCredential.java +++ b/src/main/java/org/codelibs/fess/app/web/base/login/AzureAdCredential.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/base/login/FessCredential.java b/src/main/java/org/codelibs/fess/app/web/base/login/FessCredential.java index c71d2332b4..ef6b451e33 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/login/FessCredential.java +++ b/src/main/java/org/codelibs/fess/app/web/base/login/FessCredential.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java b/src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java index 986d250b30..0b17a58f2a 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java +++ b/src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/base/login/LocalUserCredential.java b/src/main/java/org/codelibs/fess/app/web/base/login/LocalUserCredential.java index a04895a9f4..d750e01fa8 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/login/LocalUserCredential.java +++ b/src/main/java/org/codelibs/fess/app/web/base/login/LocalUserCredential.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/base/login/OpenIdConnectCredential.java b/src/main/java/org/codelibs/fess/app/web/base/login/OpenIdConnectCredential.java index 495a806bf4..c27248367d 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/login/OpenIdConnectCredential.java +++ b/src/main/java/org/codelibs/fess/app/web/base/login/OpenIdConnectCredential.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/base/login/SamlCredential.java b/src/main/java/org/codelibs/fess/app/web/base/login/SamlCredential.java index 93c854e886..a3d6ddc4a6 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/login/SamlCredential.java +++ b/src/main/java/org/codelibs/fess/app/web/base/login/SamlCredential.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/base/login/SpnegoCredential.java b/src/main/java/org/codelibs/fess/app/web/base/login/SpnegoCredential.java index dffe8c23a1..f9fbbdab1b 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/login/SpnegoCredential.java +++ b/src/main/java/org/codelibs/fess/app/web/base/login/SpnegoCredential.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 6c8a0238a2..48170db23a 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/cache/CacheForm.java b/src/main/java/org/codelibs/fess/app/web/cache/CacheForm.java index 4428cb9632..695d25553d 100644 --- a/src/main/java/org/codelibs/fess/app/web/cache/CacheForm.java +++ b/src/main/java/org/codelibs/fess/app/web/cache/CacheForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/error/ErrorAction.java b/src/main/java/org/codelibs/fess/app/web/error/ErrorAction.java index 7b4a2bd964..0eaa919b54 100644 --- a/src/main/java/org/codelibs/fess/app/web/error/ErrorAction.java +++ b/src/main/java/org/codelibs/fess/app/web/error/ErrorAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/error/ErrorBadrequrestAction.java b/src/main/java/org/codelibs/fess/app/web/error/ErrorBadrequrestAction.java index 7472bfee8f..ff1de744e6 100644 --- a/src/main/java/org/codelibs/fess/app/web/error/ErrorBadrequrestAction.java +++ b/src/main/java/org/codelibs/fess/app/web/error/ErrorBadrequrestAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/error/ErrorForm.java b/src/main/java/org/codelibs/fess/app/web/error/ErrorForm.java index 16b423223d..037b3438bc 100644 --- a/src/main/java/org/codelibs/fess/app/web/error/ErrorForm.java +++ b/src/main/java/org/codelibs/fess/app/web/error/ErrorForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/error/ErrorNotfoundAction.java b/src/main/java/org/codelibs/fess/app/web/error/ErrorNotfoundAction.java index 1d53cea9a2..450969d475 100644 --- a/src/main/java/org/codelibs/fess/app/web/error/ErrorNotfoundAction.java +++ b/src/main/java/org/codelibs/fess/app/web/error/ErrorNotfoundAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/error/ErrorSystemerrorAction.java b/src/main/java/org/codelibs/fess/app/web/error/ErrorSystemerrorAction.java index 3789f033e2..f92e39eafe 100644 --- a/src/main/java/org/codelibs/fess/app/web/error/ErrorSystemerrorAction.java +++ b/src/main/java/org/codelibs/fess/app/web/error/ErrorSystemerrorAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 09001573fc..ef2e05376e 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/go/GoForm.java b/src/main/java/org/codelibs/fess/app/web/go/GoForm.java index dc0aa735b7..f33f32474f 100644 --- a/src/main/java/org/codelibs/fess/app/web/go/GoForm.java +++ b/src/main/java/org/codelibs/fess/app/web/go/GoForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/help/HelpAction.java b/src/main/java/org/codelibs/fess/app/web/help/HelpAction.java index 49783173ae..52090615ce 100644 --- a/src/main/java/org/codelibs/fess/app/web/help/HelpAction.java +++ b/src/main/java/org/codelibs/fess/app/web/help/HelpAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/login/LoginAction.java b/src/main/java/org/codelibs/fess/app/web/login/LoginAction.java index b88a20215b..567e55abbf 100644 --- a/src/main/java/org/codelibs/fess/app/web/login/LoginAction.java +++ b/src/main/java/org/codelibs/fess/app/web/login/LoginAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/login/LoginForm.java b/src/main/java/org/codelibs/fess/app/web/login/LoginForm.java index d2bfe5dd79..2e9d4e33e4 100644 --- a/src/main/java/org/codelibs/fess/app/web/login/LoginForm.java +++ b/src/main/java/org/codelibs/fess/app/web/login/LoginForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/login/PasswordForm.java b/src/main/java/org/codelibs/fess/app/web/login/PasswordForm.java index fcca2c9472..711a7a6438 100644 --- a/src/main/java/org/codelibs/fess/app/web/login/PasswordForm.java +++ b/src/main/java/org/codelibs/fess/app/web/login/PasswordForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/logout/LogoutAction.java b/src/main/java/org/codelibs/fess/app/web/logout/LogoutAction.java index 5b583343d0..8fdcc586fe 100644 --- a/src/main/java/org/codelibs/fess/app/web/logout/LogoutAction.java +++ b/src/main/java/org/codelibs/fess/app/web/logout/LogoutAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/osdd/OsddAction.java b/src/main/java/org/codelibs/fess/app/web/osdd/OsddAction.java index 827e868991..40684d82de 100644 --- a/src/main/java/org/codelibs/fess/app/web/osdd/OsddAction.java +++ b/src/main/java/org/codelibs/fess/app/web/osdd/OsddAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 ef0400bd90..66e1f31c69 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/profile/ProfileForm.java b/src/main/java/org/codelibs/fess/app/web/profile/ProfileForm.java index 813ba73108..3438df9a28 100644 --- a/src/main/java/org/codelibs/fess/app/web/profile/ProfileForm.java +++ b/src/main/java/org/codelibs/fess/app/web/profile/ProfileForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 d751889cf4..898703dc8a 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/sso/SsoAction.java b/src/main/java/org/codelibs/fess/app/web/sso/SsoAction.java index 74f9377723..ffe11dcc3d 100644 --- a/src/main/java/org/codelibs/fess/app/web/sso/SsoAction.java +++ b/src/main/java/org/codelibs/fess/app/web/sso/SsoAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/thumbnail/ThumbnailAction.java b/src/main/java/org/codelibs/fess/app/web/thumbnail/ThumbnailAction.java index 929c97bb6b..ce21893d55 100644 --- a/src/main/java/org/codelibs/fess/app/web/thumbnail/ThumbnailAction.java +++ b/src/main/java/org/codelibs/fess/app/web/thumbnail/ThumbnailAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/app/web/thumbnail/ThumbnailForm.java b/src/main/java/org/codelibs/fess/app/web/thumbnail/ThumbnailForm.java index 5d7d314c19..7ba04bc7f5 100644 --- a/src/main/java/org/codelibs/fess/app/web/thumbnail/ThumbnailForm.java +++ b/src/main/java/org/codelibs/fess/app/web/thumbnail/ThumbnailForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/auth/AuthenticationManager.java b/src/main/java/org/codelibs/fess/auth/AuthenticationManager.java index 54a973eae6..5614ef2b1e 100644 --- a/src/main/java/org/codelibs/fess/auth/AuthenticationManager.java +++ b/src/main/java/org/codelibs/fess/auth/AuthenticationManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/auth/chain/AuthenticationChain.java b/src/main/java/org/codelibs/fess/auth/chain/AuthenticationChain.java index 8b615fad24..69ccb6ba05 100644 --- a/src/main/java/org/codelibs/fess/auth/chain/AuthenticationChain.java +++ b/src/main/java/org/codelibs/fess/auth/chain/AuthenticationChain.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/auth/chain/CommandChain.java b/src/main/java/org/codelibs/fess/auth/chain/CommandChain.java index 5a92781a44..eb61ff6eef 100644 --- a/src/main/java/org/codelibs/fess/auth/chain/CommandChain.java +++ b/src/main/java/org/codelibs/fess/auth/chain/CommandChain.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/auth/chain/LdapChain.java b/src/main/java/org/codelibs/fess/auth/chain/LdapChain.java index 68be0e6564..cda0d3a0ad 100644 --- a/src/main/java/org/codelibs/fess/auth/chain/LdapChain.java +++ b/src/main/java/org/codelibs/fess/auth/chain/LdapChain.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/cors/CorsHandler.java b/src/main/java/org/codelibs/fess/cors/CorsHandler.java index c3f355f8e6..b3590ce3b6 100644 --- a/src/main/java/org/codelibs/fess/cors/CorsHandler.java +++ b/src/main/java/org/codelibs/fess/cors/CorsHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/cors/CorsHandlerFactory.java b/src/main/java/org/codelibs/fess/cors/CorsHandlerFactory.java index 3065b95719..8669878bb9 100644 --- a/src/main/java/org/codelibs/fess/cors/CorsHandlerFactory.java +++ b/src/main/java/org/codelibs/fess/cors/CorsHandlerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/cors/DefaultCorsHandler.java b/src/main/java/org/codelibs/fess/cors/DefaultCorsHandler.java index d976d2bb2b..cb0f6558e6 100644 --- a/src/main/java/org/codelibs/fess/cors/DefaultCorsHandler.java +++ b/src/main/java/org/codelibs/fess/cors/DefaultCorsHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java b/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java index 730cd82a0d..97c06bd919 100644 --- a/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java +++ b/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/crawler/interval/FessIntervalController.java b/src/main/java/org/codelibs/fess/crawler/interval/FessIntervalController.java index 0e10bc7535..4a80bab377 100644 --- a/src/main/java/org/codelibs/fess/crawler/interval/FessIntervalController.java +++ b/src/main/java/org/codelibs/fess/crawler/interval/FessIntervalController.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/crawler/processor/FessResponseProcessor.java b/src/main/java/org/codelibs/fess/crawler/processor/FessResponseProcessor.java index 77fae6f87e..1db62c2472 100644 --- a/src/main/java/org/codelibs/fess/crawler/processor/FessResponseProcessor.java +++ b/src/main/java/org/codelibs/fess/crawler/processor/FessResponseProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 45f07aa387..23cabebac3 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/crawler/transformer/FessFileTransformer.java b/src/main/java/org/codelibs/fess/crawler/transformer/FessFileTransformer.java index b1ae0bd50c..5149c2147a 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/FessFileTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/FessFileTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/crawler/transformer/FessStandardTransformer.java b/src/main/java/org/codelibs/fess/crawler/transformer/FessStandardTransformer.java index 8af862a0c6..6f0d687f01 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/FessStandardTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/FessStandardTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/crawler/transformer/FessTransformer.java b/src/main/java/org/codelibs/fess/crawler/transformer/FessTransformer.java index c247e516c9..9f4933f871 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/FessTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/FessTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 3cf69c7576..b7d35bfec1 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/crawler/util/FessCrawlerConfig.java b/src/main/java/org/codelibs/fess/crawler/util/FessCrawlerConfig.java index 1d32b36f68..6fcd223b41 100644 --- a/src/main/java/org/codelibs/fess/crawler/util/FessCrawlerConfig.java +++ b/src/main/java/org/codelibs/fess/crawler/util/FessCrawlerConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/DictionaryCreator.java b/src/main/java/org/codelibs/fess/dict/DictionaryCreator.java index 54076f784a..2f12e10b10 100644 --- a/src/main/java/org/codelibs/fess/dict/DictionaryCreator.java +++ b/src/main/java/org/codelibs/fess/dict/DictionaryCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/DictionaryException.java b/src/main/java/org/codelibs/fess/dict/DictionaryException.java index fc8e653b48..1e071cd8b5 100644 --- a/src/main/java/org/codelibs/fess/dict/DictionaryException.java +++ b/src/main/java/org/codelibs/fess/dict/DictionaryException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/DictionaryExpiredException.java b/src/main/java/org/codelibs/fess/dict/DictionaryExpiredException.java index 811fa9040b..c620055b0b 100644 --- a/src/main/java/org/codelibs/fess/dict/DictionaryExpiredException.java +++ b/src/main/java/org/codelibs/fess/dict/DictionaryExpiredException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/DictionaryFile.java b/src/main/java/org/codelibs/fess/dict/DictionaryFile.java index f5a6f0d9fa..379582a3ee 100644 --- a/src/main/java/org/codelibs/fess/dict/DictionaryFile.java +++ b/src/main/java/org/codelibs/fess/dict/DictionaryFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/DictionaryItem.java b/src/main/java/org/codelibs/fess/dict/DictionaryItem.java index 3c155d405e..09b3ed4aad 100644 --- a/src/main/java/org/codelibs/fess/dict/DictionaryItem.java +++ b/src/main/java/org/codelibs/fess/dict/DictionaryItem.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/DictionaryManager.java b/src/main/java/org/codelibs/fess/dict/DictionaryManager.java index 4ee8a68067..dac77ffb22 100644 --- a/src/main/java/org/codelibs/fess/dict/DictionaryManager.java +++ b/src/main/java/org/codelibs/fess/dict/DictionaryManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiCreator.java b/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiCreator.java index 12bea3a970..7ff41afc0a 100644 --- a/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiCreator.java +++ b/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiFile.java b/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiFile.java index a2cb6d20f1..b8dd1a7436 100644 --- a/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiFile.java +++ b/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiItem.java b/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiItem.java index 68002b736d..14be01eace 100644 --- a/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiItem.java +++ b/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiItem.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/mapping/CharMappingCreator.java b/src/main/java/org/codelibs/fess/dict/mapping/CharMappingCreator.java index 63ad781f45..81eb901de0 100644 --- a/src/main/java/org/codelibs/fess/dict/mapping/CharMappingCreator.java +++ b/src/main/java/org/codelibs/fess/dict/mapping/CharMappingCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/mapping/CharMappingFile.java b/src/main/java/org/codelibs/fess/dict/mapping/CharMappingFile.java index 890ae57eb6..b063a956aa 100644 --- a/src/main/java/org/codelibs/fess/dict/mapping/CharMappingFile.java +++ b/src/main/java/org/codelibs/fess/dict/mapping/CharMappingFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/mapping/CharMappingItem.java b/src/main/java/org/codelibs/fess/dict/mapping/CharMappingItem.java index c9fe940a31..c613332a24 100644 --- a/src/main/java/org/codelibs/fess/dict/mapping/CharMappingItem.java +++ b/src/main/java/org/codelibs/fess/dict/mapping/CharMappingItem.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsCreator.java b/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsCreator.java index e57161eab6..1e73eecf63 100644 --- a/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsCreator.java +++ b/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsFile.java b/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsFile.java index fd74f67f85..d50e317438 100644 --- a/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsFile.java +++ b/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsItem.java b/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsItem.java index f85ce8f985..0808913bac 100644 --- a/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsItem.java +++ b/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsItem.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideCreator.java b/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideCreator.java index c1ecb30dd6..09adbc377d 100644 --- a/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideCreator.java +++ b/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideFile.java b/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideFile.java index 8c7675b72e..040cc97b90 100644 --- a/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideFile.java +++ b/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideItem.java b/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideItem.java index 3cc67ab115..c5509b7134 100644 --- a/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideItem.java +++ b/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideItem.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsCreator.java b/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsCreator.java index 90e9116b43..889b4ba349 100644 --- a/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsCreator.java +++ b/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsFile.java b/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsFile.java index 413566d0d9..10f6ae67f9 100644 --- a/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsFile.java +++ b/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsItem.java b/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsItem.java index 62b5d24aec..7b6b49632c 100644 --- a/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsItem.java +++ b/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsItem.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/synonym/SynonymCreator.java b/src/main/java/org/codelibs/fess/dict/synonym/SynonymCreator.java index 4867cdaa33..8b760b176d 100644 --- a/src/main/java/org/codelibs/fess/dict/synonym/SynonymCreator.java +++ b/src/main/java/org/codelibs/fess/dict/synonym/SynonymCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/synonym/SynonymFile.java b/src/main/java/org/codelibs/fess/dict/synonym/SynonymFile.java index b5884df640..fa6d861fdc 100644 --- a/src/main/java/org/codelibs/fess/dict/synonym/SynonymFile.java +++ b/src/main/java/org/codelibs/fess/dict/synonym/SynonymFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/dict/synonym/SynonymItem.java b/src/main/java/org/codelibs/fess/dict/synonym/SynonymItem.java index 6766dc12e6..10cf67a694 100644 --- a/src/main/java/org/codelibs/fess/dict/synonym/SynonymItem.java +++ b/src/main/java/org/codelibs/fess/dict/synonym/SynonymItem.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/ds/AbstractDataStore.java b/src/main/java/org/codelibs/fess/ds/AbstractDataStore.java index 9493d5d751..0784abe05e 100644 --- a/src/main/java/org/codelibs/fess/ds/AbstractDataStore.java +++ b/src/main/java/org/codelibs/fess/ds/AbstractDataStore.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/ds/DataStore.java b/src/main/java/org/codelibs/fess/ds/DataStore.java index 426e62d48a..0121f4842a 100644 --- a/src/main/java/org/codelibs/fess/ds/DataStore.java +++ b/src/main/java/org/codelibs/fess/ds/DataStore.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/ds/DataStoreFactory.java b/src/main/java/org/codelibs/fess/ds/DataStoreFactory.java index 4dea5d4554..253f2937b7 100644 --- a/src/main/java/org/codelibs/fess/ds/DataStoreFactory.java +++ b/src/main/java/org/codelibs/fess/ds/DataStoreFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 f0e7b7e438..7baa0d51d1 100644 --- a/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java +++ b/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallback.java b/src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallback.java index ebc1070e7c..a15f0c6fe3 100644 --- a/src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallback.java +++ b/src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallbackImpl.java b/src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallbackImpl.java index 6262ce3302..737d9b27ac 100644 --- a/src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallbackImpl.java +++ b/src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallbackImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/entity/DataStoreParams.java b/src/main/java/org/codelibs/fess/entity/DataStoreParams.java index 575052aee4..7e134be646 100644 --- a/src/main/java/org/codelibs/fess/entity/DataStoreParams.java +++ b/src/main/java/org/codelibs/fess/entity/DataStoreParams.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/entity/FacetInfo.java b/src/main/java/org/codelibs/fess/entity/FacetInfo.java index a8ccc9935b..f711812473 100644 --- a/src/main/java/org/codelibs/fess/entity/FacetInfo.java +++ b/src/main/java/org/codelibs/fess/entity/FacetInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/entity/FacetQueryView.java b/src/main/java/org/codelibs/fess/entity/FacetQueryView.java index f67400ef80..ecf015cebc 100644 --- a/src/main/java/org/codelibs/fess/entity/FacetQueryView.java +++ b/src/main/java/org/codelibs/fess/entity/FacetQueryView.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/entity/FessUser.java b/src/main/java/org/codelibs/fess/entity/FessUser.java index 0978066cdb..61b3e38994 100644 --- a/src/main/java/org/codelibs/fess/entity/FessUser.java +++ b/src/main/java/org/codelibs/fess/entity/FessUser.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/entity/GeoInfo.java b/src/main/java/org/codelibs/fess/entity/GeoInfo.java index e8c57e645b..9947891b5e 100644 --- a/src/main/java/org/codelibs/fess/entity/GeoInfo.java +++ b/src/main/java/org/codelibs/fess/entity/GeoInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/entity/HighlightInfo.java b/src/main/java/org/codelibs/fess/entity/HighlightInfo.java index 091ac61bad..814c416a7a 100644 --- a/src/main/java/org/codelibs/fess/entity/HighlightInfo.java +++ b/src/main/java/org/codelibs/fess/entity/HighlightInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/entity/ParamMap.java b/src/main/java/org/codelibs/fess/entity/ParamMap.java index 5ec35a1da7..b1fe3e271c 100644 --- a/src/main/java/org/codelibs/fess/entity/ParamMap.java +++ b/src/main/java/org/codelibs/fess/entity/ParamMap.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/entity/PingResponse.java b/src/main/java/org/codelibs/fess/entity/PingResponse.java index 7e96a09921..78c3b2a41e 100644 --- a/src/main/java/org/codelibs/fess/entity/PingResponse.java +++ b/src/main/java/org/codelibs/fess/entity/PingResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/entity/QueryContext.java b/src/main/java/org/codelibs/fess/entity/QueryContext.java index d8b4ff1975..ff770767e7 100644 --- a/src/main/java/org/codelibs/fess/entity/QueryContext.java +++ b/src/main/java/org/codelibs/fess/entity/QueryContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/entity/SearchLogEvent.java b/src/main/java/org/codelibs/fess/entity/SearchLogEvent.java index 04e2bc33cd..7d8d8d59e7 100644 --- a/src/main/java/org/codelibs/fess/entity/SearchLogEvent.java +++ b/src/main/java/org/codelibs/fess/entity/SearchLogEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/entity/SearchRenderData.java b/src/main/java/org/codelibs/fess/entity/SearchRenderData.java index fc07337543..2fd25fe741 100644 --- a/src/main/java/org/codelibs/fess/entity/SearchRenderData.java +++ b/src/main/java/org/codelibs/fess/entity/SearchRenderData.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/entity/SearchRequestParams.java b/src/main/java/org/codelibs/fess/entity/SearchRequestParams.java index d1491f2493..6d9c95ebd2 100644 --- a/src/main/java/org/codelibs/fess/entity/SearchRequestParams.java +++ b/src/main/java/org/codelibs/fess/entity/SearchRequestParams.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/client/CrawlerEngineClient.java b/src/main/java/org/codelibs/fess/es/client/CrawlerEngineClient.java index 6b357edd27..8d4f3a30a7 100644 --- a/src/main/java/org/codelibs/fess/es/client/CrawlerEngineClient.java +++ b/src/main/java/org/codelibs/fess/es/client/CrawlerEngineClient.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java b/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java index 8f161550e8..186c491afa 100644 --- a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java +++ b/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/client/SearchEngineClientException.java b/src/main/java/org/codelibs/fess/es/client/SearchEngineClientException.java index 47f9b736e2..6f7a057bea 100644 --- a/src/main/java/org/codelibs/fess/es/client/SearchEngineClientException.java +++ b/src/main/java/org/codelibs/fess/es/client/SearchEngineClientException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 ced016215e..e4c12876ed 100644 --- a/src/main/java/org/codelibs/fess/es/common/ImplementedInvokerAssistant.java +++ b/src/main/java/org/codelibs/fess/es/common/ImplementedInvokerAssistant.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java index ecec84de2a..5df5a2cb20 100644 --- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java +++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java index 512efe15f8..d07c4813cd 100644 --- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java +++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java index 325878df15..9ff5af493b 100644 --- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java +++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java index d3d1681e0c..f3c75c772d 100644 --- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java +++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java index b97d46f510..691af40237 100644 --- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java +++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java index 8ac41408eb..56020323e8 100644 --- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java +++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsSqlClause.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsSqlClause.java index a59e0c40b2..815705b412 100644 --- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsSqlClause.java +++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsSqlClause.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java index 03bafb8220..aa9a1d1621 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java index 5262f8cbcf..d6691f40f8 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java index 49314a5c55..353f7a11d9 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java index 75733227c2..3fd3b48741 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java index 6bc66c045c..5761883a2e 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java index 3aafaf3bf6..6d7d534803 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java index 552c98c0b2..36b7d4e5e7 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java index f2ef05d8ed..4c16147db6 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java index e6258b5172..f76c0a359b 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java index a31252cc01..807e3bea29 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java index f07f7ac359..b2a0407da6 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java index 281e38cbec..d0a3981c70 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java index a2f8f3b64c..631bfbc26b 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java index 074b3a9a26..70daa8dd8d 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java index 380ba1f786..c78ba7e0f5 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java index ae78272203..f0aab24bfd 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 413fb9901a..f4763db600 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java index 66d4f1355f..0104bfcdce 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java index 28f9f56874..58b3fc6bd8 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java index 863493d5ec..bb57903723 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java index 4e64160d7d..f7f8c9f70d 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 12adcba67d..3fba5b6db4 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java index c0cab6fec2..9b58f1329c 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java index e995868f7d..36d2bf4ddd 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsAccessToken.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsAccessToken.java index 84ed855f7c..366fb1b2e4 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsAccessToken.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsAccessToken.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsBadWord.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsBadWord.java index 982410bca6..96e91c6c26 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsBadWord.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsBadWord.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsBoostDocumentRule.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsBoostDocumentRule.java index e89911a8c9..ecca7f1c64 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsBoostDocumentRule.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsBoostDocumentRule.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingInfo.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingInfo.java index ce1eae3e3e..3dce81d9b5 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingInfo.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingInfoParam.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingInfoParam.java index 9089758634..8531334022 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingInfoParam.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingInfoParam.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java index 4c0b758721..377e57f3f2 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDuplicateHost.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDuplicateHost.java index e186710782..f2ef8a4807 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDuplicateHost.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDuplicateHost.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWord.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWord.java index 59344071dc..e508fc43fa 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWord.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWord.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWordToLabel.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWordToLabel.java index 5bfdcaba58..1a61a64015 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWordToLabel.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWordToLabel.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFailureUrl.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFailureUrl.java index 66807a68e8..1ac63df995 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFailureUrl.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFailureUrl.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileAuthentication.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileAuthentication.java index 234841d6be..6500f59e84 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileAuthentication.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileAuthentication.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java index 0062f8ce01..af67a58a97 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java index eb04fa880a..1d7cdf50bd 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java index ddc7aacdee..4f288da6fe 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java index 807b9425de..42c8ada43e 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java index dc1aa498f8..4a58fef2d5 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRelatedContent.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRelatedContent.java index 6b8270a4d9..ec48fd2c2c 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRelatedContent.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRelatedContent.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRelatedQuery.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRelatedQuery.java index ad357035ff..80e49ebf93 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRelatedQuery.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRelatedQuery.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRequestHeader.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRequestHeader.java index 74854182fc..dd4747969d 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRequestHeader.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRequestHeader.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRoleType.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRoleType.java index 928984a974..4f58b51352 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRoleType.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRoleType.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsScheduledJob.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsScheduledJob.java index 7fd9dc24a6..9ccd549c58 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsScheduledJob.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsScheduledJob.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsThumbnailQueue.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsThumbnailQueue.java index a0e54f1915..b67a9c0a07 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsThumbnailQueue.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsThumbnailQueue.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebAuthentication.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebAuthentication.java index 573f258649..af74ebfeb6 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebAuthentication.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebAuthentication.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java index bc54b94ac2..7d9a1073db 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 8445e62785..6e0dc3179d 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BadWordDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BadWordDbm.java index 86e1773a73..270876b6a8 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BadWordDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BadWordDbm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java index 7c299e98a7..158ad29942 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 6d128709f9..dc2c0ee383 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 3ab42079ad..658c01e7bc 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 fa72d1e004..55941a3145 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 ff857c4e9c..f84bbb2e9d 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 b4914fce5b..9278e3fa0e 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 499e4daf09..544cd30f5a 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java index b6b9c2715e..f85e7a9545 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 c1d914f537..db66d45c88 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 19ff18dd9b..8245a8e1fe 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java index 0b3fd7c5e0..ef0a577a34 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 ea2f363764..3470de3e29 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 98b97a2b1b..8eef7aca82 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 cbd8f19d90..98dd2ad5e5 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 f5b875981c..546222d123 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 dd46dc842f..950a0a3145 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 91a0f33936..4e913fe4ac 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 c3d6518853..201617cbfa 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 5557c00413..f79ee6f478 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 f39fb1fba7..c12ae6d7e6 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 c6551f36f2..47d92ae7ac 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 ddd0d1b99b..a71e401cf7 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/AccessTokenCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/AccessTokenCB.java index b8cf6e9081..d7a3fb8b1e 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/AccessTokenCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/AccessTokenCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/BadWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/BadWordCB.java index a84dbafeeb..d4f04951e6 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/BadWordCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/BadWordCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/BoostDocumentRuleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/BoostDocumentRuleCB.java index 89069bceec..2220f81f09 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/BoostDocumentRuleCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/BoostDocumentRuleCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/CrawlingInfoCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/CrawlingInfoCB.java index a1c15df0c8..4e8a330bde 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/CrawlingInfoCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/CrawlingInfoCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/CrawlingInfoParamCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/CrawlingInfoParamCB.java index e2878920db..8120fec88f 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/CrawlingInfoParamCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/CrawlingInfoParamCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/DataConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/DataConfigCB.java index dfd329e47b..e2cf64b23b 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/DataConfigCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/DataConfigCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/DuplicateHostCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/DuplicateHostCB.java index 3820f7f46f..70281a1fbd 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/DuplicateHostCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/DuplicateHostCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ElevateWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/ElevateWordCB.java index fae7b1acaa..f9d68c72b4 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ElevateWordCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ElevateWordCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ElevateWordToLabelCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/ElevateWordToLabelCB.java index ee4177ee84..e6d8c85862 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ElevateWordToLabelCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ElevateWordToLabelCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/FailureUrlCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/FailureUrlCB.java index 2582ad80b7..baabc3bba2 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/FailureUrlCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/FailureUrlCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/FileAuthenticationCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/FileAuthenticationCB.java index df34a8866b..7e23c4fdf2 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/FileAuthenticationCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/FileAuthenticationCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/FileConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/FileConfigCB.java index 09be1fa705..aac39dd8e2 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/FileConfigCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/FileConfigCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/JobLogCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/JobLogCB.java index efb7b7311c..fb6d1a450d 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/JobLogCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/JobLogCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/KeyMatchCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/KeyMatchCB.java index 337a8acf3f..5eed6d88b6 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/KeyMatchCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/KeyMatchCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/LabelTypeCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/LabelTypeCB.java index 57b1f1dc65..5d36f3501b 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/LabelTypeCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/LabelTypeCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/PathMappingCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/PathMappingCB.java index 07a1dba722..eca08cd1ad 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/PathMappingCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/PathMappingCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/RelatedContentCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/RelatedContentCB.java index c745ce8cf2..4c8be16ca9 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/RelatedContentCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/RelatedContentCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/RelatedQueryCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/RelatedQueryCB.java index c48830c6ba..6b46a7788b 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/RelatedQueryCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/RelatedQueryCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/RequestHeaderCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/RequestHeaderCB.java index 838def4191..1ad5c975df 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/RequestHeaderCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/RequestHeaderCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/RoleTypeCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/RoleTypeCB.java index e269c9d45d..0da5a83e66 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/RoleTypeCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/RoleTypeCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ScheduledJobCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/ScheduledJobCB.java index 03f5c7e10d..53bec3b5e9 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ScheduledJobCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ScheduledJobCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ThumbnailQueueCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/ThumbnailQueueCB.java index 66f15bbb19..cedffa75db 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ThumbnailQueueCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ThumbnailQueueCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/WebAuthenticationCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/WebAuthenticationCB.java index 1352183171..0286abd584 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/WebAuthenticationCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/WebAuthenticationCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/WebConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/WebConfigCB.java index 328ef483ec..4d05192049 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/WebConfigCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/WebConfigCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java index 047aa90668..f678b90602 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java index 15afe38c95..7ff2603f56 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java index 5fdf911fd7..6a0a7c0267 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java index 7cc13cb1db..dabc942531 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java index 6b36ca97d3..e0596f9928 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java index 057896616a..c33ee74f45 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java index 5ce4292c22..dd90e5a277 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java index 05d921acea..5a3044ef73 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java index 194063293d..1115063bce 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java index df856856d1..ddbad61acf 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java index f4131a75ac..16d1d3f3f5 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java index 04d8d5f813..f762dc9015 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java index aa593b7095..1fd6c201cb 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java index 859112bc3f..baa807761a 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java index e90347d44a..d47ce6de10 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java index bca6c1b392..aa6e816b0b 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java index aa5fd6a5cd..87738bf4a6 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java index 0e4fee4555..5caa79dd04 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java index a265566383..cd0d76dd39 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java index a69baa2b01..662652fe7f 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java index a4bdb81f09..a714f19aca 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java index 04861acaf2..5a5d1a741f 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java index ab97e73140..4b3baa2bbc 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java index 50ccece4a3..90b0233455 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/AccessTokenCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/AccessTokenCA.java index e438fc1bfa..60aae778f2 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/AccessTokenCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/AccessTokenCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/BadWordCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/BadWordCA.java index 3d9d5949e1..b31a5d0b5c 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/BadWordCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/BadWordCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/BoostDocumentRuleCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/BoostDocumentRuleCA.java index 9e4f3d3707..6f985a2f3f 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/BoostDocumentRuleCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/BoostDocumentRuleCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/CrawlingInfoCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/CrawlingInfoCA.java index e92623eff2..e75ce6c8a9 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/CrawlingInfoCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/CrawlingInfoCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/CrawlingInfoParamCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/CrawlingInfoParamCA.java index 77610df06d..62ee5faf3d 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/CrawlingInfoParamCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/CrawlingInfoParamCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/DataConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/DataConfigCA.java index 15194d251f..e4cd24f00f 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/DataConfigCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/DataConfigCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/DuplicateHostCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/DuplicateHostCA.java index 01937b52f6..8a77707b73 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/DuplicateHostCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/DuplicateHostCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/ElevateWordCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/ElevateWordCA.java index bf7da52c51..eb3ff5eea9 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/ElevateWordCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/ElevateWordCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/ElevateWordToLabelCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/ElevateWordToLabelCA.java index f36fb654bf..e7416b03e3 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/ElevateWordToLabelCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/ElevateWordToLabelCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/FailureUrlCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/FailureUrlCA.java index a9a0eda18a..591031ae40 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/FailureUrlCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/FailureUrlCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/FileAuthenticationCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/FileAuthenticationCA.java index 8878cb78ea..a5b823fc4e 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/FileAuthenticationCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/FileAuthenticationCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/FileConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/FileConfigCA.java index dd24035eef..3a63c729cb 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/FileConfigCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/FileConfigCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/JobLogCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/JobLogCA.java index dda7c069c3..21e9c95c54 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/JobLogCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/JobLogCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/KeyMatchCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/KeyMatchCA.java index 1d87db73f1..83a57c0102 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/KeyMatchCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/KeyMatchCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/LabelTypeCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/LabelTypeCA.java index 274d00e881..3924b7f70b 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/LabelTypeCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/LabelTypeCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/PathMappingCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/PathMappingCA.java index c74c9ba64a..3f72a7baea 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/PathMappingCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/PathMappingCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/RelatedContentCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/RelatedContentCA.java index 1b6931a346..8c1de59cf9 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/RelatedContentCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/RelatedContentCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/RelatedQueryCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/RelatedQueryCA.java index 98fb2719be..5ebf545862 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/RelatedQueryCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/RelatedQueryCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/RequestHeaderCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/RequestHeaderCA.java index 080b8aeb06..7889cf57e6 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/RequestHeaderCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/RequestHeaderCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/RoleTypeCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/RoleTypeCA.java index 889a879a68..e153ed3842 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/RoleTypeCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/RoleTypeCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/ScheduledJobCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/ScheduledJobCA.java index 94f18d0c52..d198060ff2 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/ScheduledJobCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/ScheduledJobCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/ThumbnailQueueCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/ThumbnailQueueCA.java index f21c9e967c..909c79c561 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/ThumbnailQueueCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/ThumbnailQueueCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/WebAuthenticationCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/WebAuthenticationCA.java index 64c3ee9c02..e076c8e820 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/WebAuthenticationCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/WebAuthenticationCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/WebConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/WebConfigCA.java index 128b8d74c0..3ad45b1094 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/WebConfigCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/WebConfigCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 dd19adf4d3..23d97bc80a 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 606fdac41b..8ad991993d 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 028b7745cf..779f6e3a89 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 f17b5e6bd6..add1a13887 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 4b75a428a8..ae4e36d78b 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 dd67233219..6148c5fb46 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 ba6fa6c66e..fb0b3106cc 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 587296d5ce..b0e7caf504 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 d8994e28f2..d7b38bf002 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 38ea9a520b..05505ffaf9 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 999f73348a..2148648c5b 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 0c1f4bc3d6..5a4fb6b686 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 0b147f6d7b..34e01d05c7 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 7615ff3e38..e67af5ef49 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 a8414c84c5..bf4b4595c3 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 112e00aba8..5c93f7e6b1 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 198e216835..6ae4bfcc66 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 8eaff944bd..36263ccce6 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 6775075f50..e895f6c16d 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 da7c8c4686..b06514d438 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 de745fe907..6d126f8aeb 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 4c8e1887a1..8b19295880 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 2de385ffbe..91736251e7 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 0ecf26d5e3..8b158a0bea 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/AccessTokenCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/AccessTokenCQ.java index f638418074..6a76a36e0e 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/AccessTokenCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/AccessTokenCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/BadWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/BadWordCQ.java index 92b5f2ecac..8a99048740 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/BadWordCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/BadWordCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/BoostDocumentRuleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/BoostDocumentRuleCQ.java index a826314fd0..89e7da8264 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/BoostDocumentRuleCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/BoostDocumentRuleCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingInfoCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingInfoCQ.java index bc5d624bc8..031939edcb 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingInfoCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingInfoCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingInfoParamCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingInfoParamCQ.java index 0c289360fa..5808946c12 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingInfoParamCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingInfoParamCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/DataConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/DataConfigCQ.java index dc0d288ed5..b2542ac8b9 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/DataConfigCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/DataConfigCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/DuplicateHostCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/DuplicateHostCQ.java index 11a8a58274..1a312ea0b6 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/DuplicateHostCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/DuplicateHostCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/ElevateWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/ElevateWordCQ.java index 5b42783338..7bd6b5bb68 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/ElevateWordCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/ElevateWordCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/ElevateWordToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/ElevateWordToLabelCQ.java index 361f9519e9..c0df0b8da5 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/ElevateWordToLabelCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/ElevateWordToLabelCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/FailureUrlCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/FailureUrlCQ.java index 3017f256f5..be3388c40b 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/FailureUrlCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/FailureUrlCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/FileAuthenticationCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/FileAuthenticationCQ.java index 5ec1ac241e..1a48c141df 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/FileAuthenticationCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/FileAuthenticationCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/FileConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/FileConfigCQ.java index 268dee1f1c..f7cbe1906a 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/FileConfigCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/FileConfigCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/JobLogCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/JobLogCQ.java index 31f984df8e..7b3f5c457e 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/JobLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/JobLogCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/KeyMatchCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/KeyMatchCQ.java index 85c6f78994..ccf1eff3f8 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/KeyMatchCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/KeyMatchCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/LabelTypeCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/LabelTypeCQ.java index 59c564f219..19faabcc2e 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/LabelTypeCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/LabelTypeCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/PathMappingCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/PathMappingCQ.java index be6ec2072d..2a969e3c23 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/PathMappingCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/PathMappingCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/RelatedContentCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/RelatedContentCQ.java index 6015424da2..3d03288b2f 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/RelatedContentCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/RelatedContentCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/RelatedQueryCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/RelatedQueryCQ.java index 91c597bb22..1d58086ec1 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/RelatedQueryCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/RelatedQueryCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/RequestHeaderCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/RequestHeaderCQ.java index ffb7265924..28d5fa0ea3 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/RequestHeaderCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/RequestHeaderCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/RoleTypeCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/RoleTypeCQ.java index 93f6b306ca..7735c1e828 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/RoleTypeCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/RoleTypeCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/ScheduledJobCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/ScheduledJobCQ.java index 06a65c5c32..bd17a9bcef 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/ScheduledJobCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/ScheduledJobCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/ThumbnailQueueCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/ThumbnailQueueCQ.java index 5a6771004c..1c38367201 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/ThumbnailQueueCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/ThumbnailQueueCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/WebAuthenticationCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/WebAuthenticationCQ.java index 118d1e2adb..4a8e73eb5e 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/WebAuthenticationCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/WebAuthenticationCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/WebConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/WebConfigCQ.java index 27885f1d01..ea82461771 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/WebConfigCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/WebConfigCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 b6aad7aafd..ed4b1d3078 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 a4f2ab6513..adee168206 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 8760bcd89c..6c9f413383 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 bbc7933fae..e10f52f110 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 31862d21b3..6c35e9fb14 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 7f3b1ae752..e2c53cde18 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 d82d2eebf8..8275cf5441 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 3f4d989458..b568312251 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 16270f8180..be956cecd2 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 adc75a3857..5cb490ce39 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 d25d4e361f..c434b2a8e9 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 65341f0659..1ac0d67da8 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 23b6dfafb6..2af05f6a6a 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 b3a2d6307f..c8c70e076e 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 8d824a8578..34176395e8 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 7be0d82912..ac328a17ec 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 69c645b40b..982c8afaef 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 9c206f0118..7789384957 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 08dd7e17ad..7038a561e4 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 ff30ea8109..5d743c3365 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 19951cdba1..f26a29fdaf 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 eadd2368ed..06fa0fef81 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 66acefab9f..39890fb31e 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 9f882d53ee..f09e50603e 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/AccessTokenBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/AccessTokenBhv.java index 2b83b3dbe7..b2225662df 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/AccessTokenBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/AccessTokenBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/BadWordBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/BadWordBhv.java index cf8abe8075..6d5a5eb4f0 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/BadWordBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/BadWordBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/BoostDocumentRuleBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/BoostDocumentRuleBhv.java index a4be0c7686..a5a076d90a 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/BoostDocumentRuleBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/BoostDocumentRuleBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoBhv.java index 25b930e801..76ef6bc43c 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoParamBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoParamBhv.java index 9a416632e9..c101bc18da 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoParamBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoParamBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/DataConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/DataConfigBhv.java index 83311c2704..d8bd400073 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/DataConfigBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/DataConfigBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/DuplicateHostBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/DuplicateHostBhv.java index 53b9b1f0f8..247b826dc6 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/DuplicateHostBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/DuplicateHostBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordBhv.java index c58cb578c9..528716884e 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordToLabelBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordToLabelBhv.java index eef76b1c16..2c56e1047e 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordToLabelBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordToLabelBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/FailureUrlBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/FailureUrlBhv.java index ffd815b2c1..a37911a2c8 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/FailureUrlBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/FailureUrlBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/FileAuthenticationBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/FileAuthenticationBhv.java index f9d98436b8..974153ff6e 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/FileAuthenticationBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/FileAuthenticationBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/FileConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/FileConfigBhv.java index fae832c78c..8d9370c201 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/FileConfigBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/FileConfigBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/JobLogBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/JobLogBhv.java index 3968cb4b5a..01b7e3b35b 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/JobLogBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/JobLogBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/KeyMatchBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/KeyMatchBhv.java index aae520997f..fe92efb7e7 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/KeyMatchBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/KeyMatchBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/LabelTypeBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/LabelTypeBhv.java index c37f7dd9d7..0fed4f894d 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/LabelTypeBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/LabelTypeBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/PathMappingBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/PathMappingBhv.java index 13414a4696..cd03ba3c9d 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/PathMappingBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/PathMappingBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/RelatedContentBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/RelatedContentBhv.java index cabe53eb69..d50cd20606 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/RelatedContentBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/RelatedContentBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/RelatedQueryBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/RelatedQueryBhv.java index 05cc208d6b..9e7b092e0e 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/RelatedQueryBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/RelatedQueryBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/RequestHeaderBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/RequestHeaderBhv.java index 898ae42e4f..df9d1a89ed 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/RequestHeaderBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/RequestHeaderBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/RoleTypeBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/RoleTypeBhv.java index 2259ecf1e0..997f8a2f84 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/RoleTypeBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/RoleTypeBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/ScheduledJobBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/ScheduledJobBhv.java index 3036554a2e..19594fcf1b 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/ScheduledJobBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/ScheduledJobBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/ThumbnailQueueBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/ThumbnailQueueBhv.java index a17bc299e8..0ddb9235cb 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/ThumbnailQueueBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/ThumbnailQueueBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/WebAuthenticationBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/WebAuthenticationBhv.java index 6781f25296..dece725450 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/WebAuthenticationBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/WebAuthenticationBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/WebConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/WebConfigBhv.java index 749dbe9cea..1153ba28c1 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/WebConfigBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/WebConfigBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/AccessToken.java b/src/main/java/org/codelibs/fess/es/config/exentity/AccessToken.java index 20dab8451a..6ca643c9ad 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/AccessToken.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/AccessToken.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/BadWord.java b/src/main/java/org/codelibs/fess/es/config/exentity/BadWord.java index 06302c7a77..0c7a055370 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/BadWord.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/BadWord.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/BoostDocumentRule.java b/src/main/java/org/codelibs/fess/es/config/exentity/BoostDocumentRule.java index 3b0d561206..2e34b3b0a0 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/BoostDocumentRule.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/BoostDocumentRule.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfig.java b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfig.java index 517aeae33c..992461f6d0 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfig.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfigWrapper.java b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfigWrapper.java index cbe56ceaf8..43bb3a2211 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfigWrapper.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingConfigWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfo.java b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfo.java index 7fe1562155..9d93874de4 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfo.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfoParam.java b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfoParam.java index 8cb3638b37..08f5efd442 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfoParam.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfoParam.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 19d44813f1..6b439480a5 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/DuplicateHost.java b/src/main/java/org/codelibs/fess/es/config/exentity/DuplicateHost.java index 64e286e52c..9115a6d2f4 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/DuplicateHost.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/DuplicateHost.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/ElevateWord.java b/src/main/java/org/codelibs/fess/es/config/exentity/ElevateWord.java index bca42c873e..c0b5c7fa46 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/ElevateWord.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/ElevateWord.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/ElevateWordToLabel.java b/src/main/java/org/codelibs/fess/es/config/exentity/ElevateWordToLabel.java index f1888bc333..a0141896cd 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/ElevateWordToLabel.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/ElevateWordToLabel.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/FailureUrl.java b/src/main/java/org/codelibs/fess/es/config/exentity/FailureUrl.java index 9b76995eb5..17c11cf7ec 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/FailureUrl.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/FailureUrl.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/FileAuthentication.java b/src/main/java/org/codelibs/fess/es/config/exentity/FileAuthentication.java index 9cd99e153d..02da94f669 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/FileAuthentication.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/FileAuthentication.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/FileConfig.java b/src/main/java/org/codelibs/fess/es/config/exentity/FileConfig.java index 5f24192d77..976fb82842 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/FileConfig.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/FileConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/JobLog.java b/src/main/java/org/codelibs/fess/es/config/exentity/JobLog.java index 7d679fe3eb..4c773e9773 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/JobLog.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/JobLog.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/KeyMatch.java b/src/main/java/org/codelibs/fess/es/config/exentity/KeyMatch.java index b6d3b4c514..41fa3ad72b 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/KeyMatch.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/KeyMatch.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/LabelType.java b/src/main/java/org/codelibs/fess/es/config/exentity/LabelType.java index 091dc96dbb..751737eab7 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/LabelType.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/LabelType.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/PathMapping.java b/src/main/java/org/codelibs/fess/es/config/exentity/PathMapping.java index 3c1137571f..853b42c3df 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/PathMapping.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/PathMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/RelatedContent.java b/src/main/java/org/codelibs/fess/es/config/exentity/RelatedContent.java index 66348a70bb..f2497d326e 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/RelatedContent.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/RelatedContent.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/RelatedQuery.java b/src/main/java/org/codelibs/fess/es/config/exentity/RelatedQuery.java index a41de33dce..623594d1ce 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/RelatedQuery.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/RelatedQuery.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/RequestHeader.java b/src/main/java/org/codelibs/fess/es/config/exentity/RequestHeader.java index 6e8d6e67ae..06d18d831b 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/RequestHeader.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/RequestHeader.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/RoleType.java b/src/main/java/org/codelibs/fess/es/config/exentity/RoleType.java index 620c7c1f31..305a4a97bb 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/RoleType.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/RoleType.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 bc26e1e6ff..fcfee91aeb 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/ThumbnailQueue.java b/src/main/java/org/codelibs/fess/es/config/exentity/ThumbnailQueue.java index 6902d3a0a9..0573a489c4 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/ThumbnailQueue.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/ThumbnailQueue.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 edf52069a8..2422291154 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 3dee1a21fd..b580acc791 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java index 1de5104193..dc935bcfa2 100644 --- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java +++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java index 35466e692e..62dcf98e1c 100644 --- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java +++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java index 4468af8c76..20b6d810d2 100644 --- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java +++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java index 9acadf7bcf..232d3112de 100644 --- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java +++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java index 8d633517f9..ea06bb725d 100644 --- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java +++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java index 597eb39d86..1ae19f182c 100644 --- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java +++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsSqlClause.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsSqlClause.java index 0cf7e06d2c..df23485d21 100644 --- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsSqlClause.java +++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsSqlClause.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java index 032a6c70b9..66a8f465bd 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java +++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java index 8ae7cf18de..79ac1efda6 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java +++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java index bfed8af286..9501e128f6 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java +++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java index 20ae273d38..e75bd4dad5 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java +++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/BsClickLog.java b/src/main/java/org/codelibs/fess/es/log/bsentity/BsClickLog.java index 439d66c556..40101db929 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/BsClickLog.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/BsClickLog.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/BsFavoriteLog.java b/src/main/java/org/codelibs/fess/es/log/bsentity/BsFavoriteLog.java index c375d3d88d..047d73a7be 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/BsFavoriteLog.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/BsFavoriteLog.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchLog.java b/src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchLog.java index 4f51d55a90..2e42dd7adc 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchLog.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchLog.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/BsUserInfo.java b/src/main/java/org/codelibs/fess/es/log/bsentity/BsUserInfo.java index eb5707b8c5..9c5a7c5a40 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/BsUserInfo.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/BsUserInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 71c4fcd303..3f25e9e22e 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 555e370a60..1538a4ea95 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 91bf1869e8..5e8b75851b 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java index 8d65ec49e0..14adc17675 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ClickLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/ClickLogCB.java index 18a47d3636..67ff2ce908 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/ClickLogCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/ClickLogCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/FavoriteLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/FavoriteLogCB.java index 519afc7902..6c387ddfe6 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/FavoriteLogCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/FavoriteLogCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/SearchLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/SearchLogCB.java index f88eeb7c85..17df70ab9d 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/SearchLogCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/SearchLogCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/UserInfoCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/UserInfoCB.java index 5996e083af..6aa7718ad8 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/UserInfoCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/UserInfoCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java index 070ddb736c..d1710615ca 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java index 4f2fa31cb5..b0421fc356 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java index 647b6ae6f2..53172b1e3f 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java index cf7ed362db..e4b2a71d45 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/ClickLogCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/ClickLogCA.java index f244d7c718..3e50f02121 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/ClickLogCA.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/ClickLogCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/FavoriteLogCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/FavoriteLogCA.java index 8d1b32c112..8d7008f396 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/FavoriteLogCA.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/FavoriteLogCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/SearchLogCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/SearchLogCA.java index f93a6ebba0..38891af0a5 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/SearchLogCA.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/SearchLogCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/UserInfoCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/UserInfoCA.java index b513437c08..ae0c00c789 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/UserInfoCA.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/UserInfoCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 c59d97c657..6455e295ba 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 b179022156..0d6fb42ab2 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 6021fb6a2b..f450bf7dd9 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java index a6114a744f..bfcdb826a5 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/ClickLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/ClickLogCQ.java index ce9d19b1bf..e811c136f7 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/ClickLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/ClickLogCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/FavoriteLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/FavoriteLogCQ.java index b494a5b04c..96e73d251e 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/FavoriteLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/FavoriteLogCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/SearchLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/SearchLogCQ.java index 13998f672f..4f7335d7c1 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/SearchLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/SearchLogCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/UserInfoCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/UserInfoCQ.java index 4ef0a695ae..6e6c2e1223 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/UserInfoCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/UserInfoCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 274c3e27a9..12a1dcb8b8 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 a0fb88d8c2..8d6d1a93c9 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 3a2adaab67..6e56a812f7 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 0d691628d6..0877af1f48 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/exbhv/ClickLogBhv.java b/src/main/java/org/codelibs/fess/es/log/exbhv/ClickLogBhv.java index 0ce99ac7d4..47372f740f 100644 --- a/src/main/java/org/codelibs/fess/es/log/exbhv/ClickLogBhv.java +++ b/src/main/java/org/codelibs/fess/es/log/exbhv/ClickLogBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/exbhv/FavoriteLogBhv.java b/src/main/java/org/codelibs/fess/es/log/exbhv/FavoriteLogBhv.java index bf3c4c8c1f..c0883a5fc0 100644 --- a/src/main/java/org/codelibs/fess/es/log/exbhv/FavoriteLogBhv.java +++ b/src/main/java/org/codelibs/fess/es/log/exbhv/FavoriteLogBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/exbhv/SearchLogBhv.java b/src/main/java/org/codelibs/fess/es/log/exbhv/SearchLogBhv.java index 7cd5a1314a..a13d50132e 100644 --- a/src/main/java/org/codelibs/fess/es/log/exbhv/SearchLogBhv.java +++ b/src/main/java/org/codelibs/fess/es/log/exbhv/SearchLogBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/exbhv/UserInfoBhv.java b/src/main/java/org/codelibs/fess/es/log/exbhv/UserInfoBhv.java index 0396a9380c..5ac349c530 100644 --- a/src/main/java/org/codelibs/fess/es/log/exbhv/UserInfoBhv.java +++ b/src/main/java/org/codelibs/fess/es/log/exbhv/UserInfoBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/exentity/ClickLog.java b/src/main/java/org/codelibs/fess/es/log/exentity/ClickLog.java index ac1846045a..5467584de9 100644 --- a/src/main/java/org/codelibs/fess/es/log/exentity/ClickLog.java +++ b/src/main/java/org/codelibs/fess/es/log/exentity/ClickLog.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/exentity/FavoriteLog.java b/src/main/java/org/codelibs/fess/es/log/exentity/FavoriteLog.java index 888328cafc..fe3b4cbf7d 100644 --- a/src/main/java/org/codelibs/fess/es/log/exentity/FavoriteLog.java +++ b/src/main/java/org/codelibs/fess/es/log/exentity/FavoriteLog.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 122ccb00d6..d67d47c26a 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/log/exentity/UserInfo.java b/src/main/java/org/codelibs/fess/es/log/exentity/UserInfo.java index 34bc7a6361..2b1d3f150b 100644 --- a/src/main/java/org/codelibs/fess/es/log/exentity/UserInfo.java +++ b/src/main/java/org/codelibs/fess/es/log/exentity/UserInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java b/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java index 5488b2a849..cd7f99dc60 100644 --- a/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java +++ b/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java index 91a5c213af..80ec5bd34b 100644 --- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java +++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java index ab55f7226e..9ffd27f338 100644 --- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java +++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java index e18d6e098e..b089801084 100644 --- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java +++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java index 44c3d01dfa..a66608bdd7 100644 --- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java +++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java index 00218afa85..d3a6c5831d 100644 --- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java +++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java index 075fc2e9f2..ae06270d05 100644 --- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java +++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsSqlClause.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsSqlClause.java index 0e43f379d6..43bfef6952 100644 --- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsSqlClause.java +++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsSqlClause.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 3599736930..aeb89e2a07 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 00fa52b6c3..f46db374de 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 601dd5201a..4c3be1ec49 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java b/src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java index ed47b87e51..c32d91fb13 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java +++ b/src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/BsRole.java b/src/main/java/org/codelibs/fess/es/user/bsentity/BsRole.java index 8d3200b718..a76a8e0ce8 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsentity/BsRole.java +++ b/src/main/java/org/codelibs/fess/es/user/bsentity/BsRole.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java b/src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java index 2cf5a0d9c0..e4e139bc10 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java +++ b/src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java index c161d05e83..b8a2ac71dc 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java +++ b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java index e40f4c99fc..180b85e17b 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java +++ b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 f99efc77d6..be195b4955 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/GroupCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/GroupCB.java index c46aaca7e9..430807e604 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/GroupCB.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/GroupCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/RoleCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/RoleCB.java index fdabca9b7f..46bdc0e0ff 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/RoleCB.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/RoleCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/UserCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/UserCB.java index 654efc7c58..d2a4712a4e 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/UserCB.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/UserCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java index 279b68ef6e..8213ce4d1b 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java index e65c1b39f0..3d6a4107fe 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java index cc978d9453..915c80c09a 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/GroupCA.java b/src/main/java/org/codelibs/fess/es/user/cbean/ca/GroupCA.java index af49153c7c..ac9fc3e180 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/GroupCA.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/ca/GroupCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/RoleCA.java b/src/main/java/org/codelibs/fess/es/user/cbean/ca/RoleCA.java index c05fdd9dac..9dc2bea726 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/RoleCA.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/ca/RoleCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/UserCA.java b/src/main/java/org/codelibs/fess/es/user/cbean/ca/UserCA.java index 761dabc6eb..aa9d1b7a4c 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/UserCA.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/ca/UserCA.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 21dbac5277..246dac281f 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 e922b81cb5..03d896145d 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 c65a86e6f7..6dc80b96db 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/GroupCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/GroupCQ.java index febafb30e4..b810a1188d 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/GroupCQ.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/GroupCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/RoleCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/RoleCQ.java index 69a0c6b001..47bc46aa95 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/RoleCQ.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/RoleCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/UserCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/UserCQ.java index 4697625405..03aeaf5d08 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/UserCQ.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/UserCQ.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 73fcb5f358..dc67431a34 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 4091781980..6398dfbd14 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 ef3c67d70d..1c354b6481 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/exbhv/GroupBhv.java b/src/main/java/org/codelibs/fess/es/user/exbhv/GroupBhv.java index 756af7101e..7489a24175 100644 --- a/src/main/java/org/codelibs/fess/es/user/exbhv/GroupBhv.java +++ b/src/main/java/org/codelibs/fess/es/user/exbhv/GroupBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/exbhv/RoleBhv.java b/src/main/java/org/codelibs/fess/es/user/exbhv/RoleBhv.java index 66223567de..8204df5010 100644 --- a/src/main/java/org/codelibs/fess/es/user/exbhv/RoleBhv.java +++ b/src/main/java/org/codelibs/fess/es/user/exbhv/RoleBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/exbhv/UserBhv.java b/src/main/java/org/codelibs/fess/es/user/exbhv/UserBhv.java index 391ea24783..2392747dc1 100644 --- a/src/main/java/org/codelibs/fess/es/user/exbhv/UserBhv.java +++ b/src/main/java/org/codelibs/fess/es/user/exbhv/UserBhv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/exentity/Group.java b/src/main/java/org/codelibs/fess/es/user/exentity/Group.java index e4c72469a8..ece518df66 100644 --- a/src/main/java/org/codelibs/fess/es/user/exentity/Group.java +++ b/src/main/java/org/codelibs/fess/es/user/exentity/Group.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/exentity/Role.java b/src/main/java/org/codelibs/fess/es/user/exentity/Role.java index af535b451a..076c32302c 100644 --- a/src/main/java/org/codelibs/fess/es/user/exentity/Role.java +++ b/src/main/java/org/codelibs/fess/es/user/exentity/Role.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/es/user/exentity/User.java b/src/main/java/org/codelibs/fess/es/user/exentity/User.java index d1fe2bba6c..f687cb88a9 100644 --- a/src/main/java/org/codelibs/fess/es/user/exentity/User.java +++ b/src/main/java/org/codelibs/fess/es/user/exentity/User.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/CommandExecutionException.java b/src/main/java/org/codelibs/fess/exception/CommandExecutionException.java index 7b785d4860..b5029f4582 100644 --- a/src/main/java/org/codelibs/fess/exception/CommandExecutionException.java +++ b/src/main/java/org/codelibs/fess/exception/CommandExecutionException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/ContainerNotAvailableException.java b/src/main/java/org/codelibs/fess/exception/ContainerNotAvailableException.java index 007ef5d2ee..b425cbb6f4 100644 --- a/src/main/java/org/codelibs/fess/exception/ContainerNotAvailableException.java +++ b/src/main/java/org/codelibs/fess/exception/ContainerNotAvailableException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/ContentNotFoundException.java b/src/main/java/org/codelibs/fess/exception/ContentNotFoundException.java index 047ab4194b..97c265fc50 100644 --- a/src/main/java/org/codelibs/fess/exception/ContentNotFoundException.java +++ b/src/main/java/org/codelibs/fess/exception/ContentNotFoundException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/DataStoreCrawlingException.java b/src/main/java/org/codelibs/fess/exception/DataStoreCrawlingException.java index 76fc313a1c..08938c40ff 100644 --- a/src/main/java/org/codelibs/fess/exception/DataStoreCrawlingException.java +++ b/src/main/java/org/codelibs/fess/exception/DataStoreCrawlingException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/DataStoreException.java b/src/main/java/org/codelibs/fess/exception/DataStoreException.java index e88d038b77..e6a9870d59 100644 --- a/src/main/java/org/codelibs/fess/exception/DataStoreException.java +++ b/src/main/java/org/codelibs/fess/exception/DataStoreException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/FessSystemException.java b/src/main/java/org/codelibs/fess/exception/FessSystemException.java index 82484048f4..6d09a39462 100644 --- a/src/main/java/org/codelibs/fess/exception/FessSystemException.java +++ b/src/main/java/org/codelibs/fess/exception/FessSystemException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/FessUserNotFoundException.java b/src/main/java/org/codelibs/fess/exception/FessUserNotFoundException.java index 7ea6dd3b6f..a56bd2613d 100644 --- a/src/main/java/org/codelibs/fess/exception/FessUserNotFoundException.java +++ b/src/main/java/org/codelibs/fess/exception/FessUserNotFoundException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/GsaConfigException.java b/src/main/java/org/codelibs/fess/exception/GsaConfigException.java index 15361b061b..a63621e897 100644 --- a/src/main/java/org/codelibs/fess/exception/GsaConfigException.java +++ b/src/main/java/org/codelibs/fess/exception/GsaConfigException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/InvalidAccessTokenException.java b/src/main/java/org/codelibs/fess/exception/InvalidAccessTokenException.java index 86b9f8a3a9..dc5fd15b44 100644 --- a/src/main/java/org/codelibs/fess/exception/InvalidAccessTokenException.java +++ b/src/main/java/org/codelibs/fess/exception/InvalidAccessTokenException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/InvalidQueryException.java b/src/main/java/org/codelibs/fess/exception/InvalidQueryException.java index 7328435f5a..85e968ee67 100644 --- a/src/main/java/org/codelibs/fess/exception/InvalidQueryException.java +++ b/src/main/java/org/codelibs/fess/exception/InvalidQueryException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/JobNotFoundException.java b/src/main/java/org/codelibs/fess/exception/JobNotFoundException.java index f4089e9f0a..66a0965f66 100644 --- a/src/main/java/org/codelibs/fess/exception/JobNotFoundException.java +++ b/src/main/java/org/codelibs/fess/exception/JobNotFoundException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/JobProcessingException.java b/src/main/java/org/codelibs/fess/exception/JobProcessingException.java index aee946f93c..3520ead77c 100644 --- a/src/main/java/org/codelibs/fess/exception/JobProcessingException.java +++ b/src/main/java/org/codelibs/fess/exception/JobProcessingException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/LdapConfigurationException.java b/src/main/java/org/codelibs/fess/exception/LdapConfigurationException.java index b49127918c..c704babe4c 100644 --- a/src/main/java/org/codelibs/fess/exception/LdapConfigurationException.java +++ b/src/main/java/org/codelibs/fess/exception/LdapConfigurationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/LdapOperationException.java b/src/main/java/org/codelibs/fess/exception/LdapOperationException.java index 2eecdf52af..45cecb2853 100644 --- a/src/main/java/org/codelibs/fess/exception/LdapOperationException.java +++ b/src/main/java/org/codelibs/fess/exception/LdapOperationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/PluginException.java b/src/main/java/org/codelibs/fess/exception/PluginException.java index c3801c9925..0b0850ad7b 100644 --- a/src/main/java/org/codelibs/fess/exception/PluginException.java +++ b/src/main/java/org/codelibs/fess/exception/PluginException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/QueryParseException.java b/src/main/java/org/codelibs/fess/exception/QueryParseException.java index 039cc6f6b5..cc290ff3f8 100644 --- a/src/main/java/org/codelibs/fess/exception/QueryParseException.java +++ b/src/main/java/org/codelibs/fess/exception/QueryParseException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/ResultOffsetExceededException.java b/src/main/java/org/codelibs/fess/exception/ResultOffsetExceededException.java index a5883fb786..a4d387db42 100644 --- a/src/main/java/org/codelibs/fess/exception/ResultOffsetExceededException.java +++ b/src/main/java/org/codelibs/fess/exception/ResultOffsetExceededException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/ScheduledJobException.java b/src/main/java/org/codelibs/fess/exception/ScheduledJobException.java index d02137a555..be6b107c1b 100644 --- a/src/main/java/org/codelibs/fess/exception/ScheduledJobException.java +++ b/src/main/java/org/codelibs/fess/exception/ScheduledJobException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/ScriptEngineException.java b/src/main/java/org/codelibs/fess/exception/ScriptEngineException.java index 2be7d5ef91..c713ed0e03 100644 --- a/src/main/java/org/codelibs/fess/exception/ScriptEngineException.java +++ b/src/main/java/org/codelibs/fess/exception/ScriptEngineException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/SearchQueryException.java b/src/main/java/org/codelibs/fess/exception/SearchQueryException.java index 6312fc5445..56679bcdd7 100644 --- a/src/main/java/org/codelibs/fess/exception/SearchQueryException.java +++ b/src/main/java/org/codelibs/fess/exception/SearchQueryException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/ServletRuntimeException.java b/src/main/java/org/codelibs/fess/exception/ServletRuntimeException.java index cb3db6b965..e5216ebcb1 100644 --- a/src/main/java/org/codelibs/fess/exception/ServletRuntimeException.java +++ b/src/main/java/org/codelibs/fess/exception/ServletRuntimeException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/SsoLoginException.java b/src/main/java/org/codelibs/fess/exception/SsoLoginException.java index 3680b1b5ed..9d7f3e22dc 100644 --- a/src/main/java/org/codelibs/fess/exception/SsoLoginException.java +++ b/src/main/java/org/codelibs/fess/exception/SsoLoginException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/SsoMessageException.java b/src/main/java/org/codelibs/fess/exception/SsoMessageException.java index 41eb959419..c9cc5763cc 100644 --- a/src/main/java/org/codelibs/fess/exception/SsoMessageException.java +++ b/src/main/java/org/codelibs/fess/exception/SsoMessageException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/SsoProcessException.java b/src/main/java/org/codelibs/fess/exception/SsoProcessException.java index 3ad4ad5fa0..fb1cb3b633 100644 --- a/src/main/java/org/codelibs/fess/exception/SsoProcessException.java +++ b/src/main/java/org/codelibs/fess/exception/SsoProcessException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/StorageException.java b/src/main/java/org/codelibs/fess/exception/StorageException.java index 946499c6d6..b380a9058c 100644 --- a/src/main/java/org/codelibs/fess/exception/StorageException.java +++ b/src/main/java/org/codelibs/fess/exception/StorageException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/ThemeException.java b/src/main/java/org/codelibs/fess/exception/ThemeException.java index fa399ee36e..ca6e5a709b 100644 --- a/src/main/java/org/codelibs/fess/exception/ThemeException.java +++ b/src/main/java/org/codelibs/fess/exception/ThemeException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/ThumbnailGenerationException.java b/src/main/java/org/codelibs/fess/exception/ThumbnailGenerationException.java index 1408dd27fe..50986afc48 100644 --- a/src/main/java/org/codelibs/fess/exception/ThumbnailGenerationException.java +++ b/src/main/java/org/codelibs/fess/exception/ThumbnailGenerationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/UnsupportedSearchException.java b/src/main/java/org/codelibs/fess/exception/UnsupportedSearchException.java index 7d683e5bf7..e71833b075 100644 --- a/src/main/java/org/codelibs/fess/exception/UnsupportedSearchException.java +++ b/src/main/java/org/codelibs/fess/exception/UnsupportedSearchException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/UserRoleLoginException.java b/src/main/java/org/codelibs/fess/exception/UserRoleLoginException.java index cd951a1dbf..54b8a3f955 100644 --- a/src/main/java/org/codelibs/fess/exception/UserRoleLoginException.java +++ b/src/main/java/org/codelibs/fess/exception/UserRoleLoginException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exception/WebApiException.java b/src/main/java/org/codelibs/fess/exception/WebApiException.java index 0b18465f85..7716d1fb72 100644 --- a/src/main/java/org/codelibs/fess/exception/WebApiException.java +++ b/src/main/java/org/codelibs/fess/exception/WebApiException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exec/Crawler.java b/src/main/java/org/codelibs/fess/exec/Crawler.java index e28c7048fa..f0624fa86a 100644 --- a/src/main/java/org/codelibs/fess/exec/Crawler.java +++ b/src/main/java/org/codelibs/fess/exec/Crawler.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exec/SuggestCreator.java b/src/main/java/org/codelibs/fess/exec/SuggestCreator.java index 5d2f44283f..4c12d8091b 100644 --- a/src/main/java/org/codelibs/fess/exec/SuggestCreator.java +++ b/src/main/java/org/codelibs/fess/exec/SuggestCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java b/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java index b2bf310898..05151cde82 100644 --- a/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java +++ b/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/filter/CorsFilter.java b/src/main/java/org/codelibs/fess/filter/CorsFilter.java index b0e2a1da64..66ebc0be3a 100644 --- a/src/main/java/org/codelibs/fess/filter/CorsFilter.java +++ b/src/main/java/org/codelibs/fess/filter/CorsFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/filter/EncodingFilter.java b/src/main/java/org/codelibs/fess/filter/EncodingFilter.java index 67b6f2c7a7..2cf69dd3ef 100644 --- a/src/main/java/org/codelibs/fess/filter/EncodingFilter.java +++ b/src/main/java/org/codelibs/fess/filter/EncodingFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/filter/WebApiFilter.java b/src/main/java/org/codelibs/fess/filter/WebApiFilter.java index 850641e412..89d404dbf9 100644 --- a/src/main/java/org/codelibs/fess/filter/WebApiFilter.java +++ b/src/main/java/org/codelibs/fess/filter/WebApiFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/AbstractConfigHelper.java b/src/main/java/org/codelibs/fess/helper/AbstractConfigHelper.java index 4870f7dcba..6ee3f6fbf1 100644 --- a/src/main/java/org/codelibs/fess/helper/AbstractConfigHelper.java +++ b/src/main/java/org/codelibs/fess/helper/AbstractConfigHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/AccessTokenHelper.java b/src/main/java/org/codelibs/fess/helper/AccessTokenHelper.java index 870df007f6..efcda484cb 100644 --- a/src/main/java/org/codelibs/fess/helper/AccessTokenHelper.java +++ b/src/main/java/org/codelibs/fess/helper/AccessTokenHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/ActivityHelper.java b/src/main/java/org/codelibs/fess/helper/ActivityHelper.java index 50f75bc5ac..f9ccd46c20 100644 --- a/src/main/java/org/codelibs/fess/helper/ActivityHelper.java +++ b/src/main/java/org/codelibs/fess/helper/ActivityHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java index 9ec890b5f9..5f61c919f3 100644 --- a/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java +++ b/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/CrawlerStatsHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlerStatsHelper.java index f0071e7340..bb44af907a 100644 --- a/src/main/java/org/codelibs/fess/helper/CrawlerStatsHelper.java +++ b/src/main/java/org/codelibs/fess/helper/CrawlerStatsHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java index 7004b8a3f5..2aa1431934 100644 --- a/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java +++ b/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java index 3263e5e712..80a1c7787b 100644 --- a/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java +++ b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/CurlHelper.java b/src/main/java/org/codelibs/fess/helper/CurlHelper.java index 3636f4c8b7..f550400f82 100644 --- a/src/main/java/org/codelibs/fess/helper/CurlHelper.java +++ b/src/main/java/org/codelibs/fess/helper/CurlHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java index 8332b5a19b..c5c00a1398 100644 --- a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java +++ b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/DocumentHelper.java b/src/main/java/org/codelibs/fess/helper/DocumentHelper.java index 9fc80971ce..aba265c2e6 100644 --- a/src/main/java/org/codelibs/fess/helper/DocumentHelper.java +++ b/src/main/java/org/codelibs/fess/helper/DocumentHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/DuplicateHostHelper.java b/src/main/java/org/codelibs/fess/helper/DuplicateHostHelper.java index 930909c123..2d8b15473e 100644 --- a/src/main/java/org/codelibs/fess/helper/DuplicateHostHelper.java +++ b/src/main/java/org/codelibs/fess/helper/DuplicateHostHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/FileTypeHelper.java b/src/main/java/org/codelibs/fess/helper/FileTypeHelper.java index 15ae030749..6e77f3604d 100644 --- a/src/main/java/org/codelibs/fess/helper/FileTypeHelper.java +++ b/src/main/java/org/codelibs/fess/helper/FileTypeHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java index 699e1db3ea..141ce4c81c 100644 --- a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java +++ b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/IntervalControlHelper.java b/src/main/java/org/codelibs/fess/helper/IntervalControlHelper.java index 31d5dc5e1e..85a90d4721 100644 --- a/src/main/java/org/codelibs/fess/helper/IntervalControlHelper.java +++ b/src/main/java/org/codelibs/fess/helper/IntervalControlHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/JobHelper.java b/src/main/java/org/codelibs/fess/helper/JobHelper.java index 244f2a310a..9f70a64e4c 100644 --- a/src/main/java/org/codelibs/fess/helper/JobHelper.java +++ b/src/main/java/org/codelibs/fess/helper/JobHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java b/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java index 4d21f42a0f..b9c54af304 100644 --- a/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java +++ b/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java b/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java index 899a250d61..e0cb857e89 100644 --- a/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java +++ b/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/LanguageHelper.java b/src/main/java/org/codelibs/fess/helper/LanguageHelper.java index 1956be7487..be3bb40f92 100644 --- a/src/main/java/org/codelibs/fess/helper/LanguageHelper.java +++ b/src/main/java/org/codelibs/fess/helper/LanguageHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/NotificationHelper.java b/src/main/java/org/codelibs/fess/helper/NotificationHelper.java index c9df58ca96..9baeec413d 100644 --- a/src/main/java/org/codelibs/fess/helper/NotificationHelper.java +++ b/src/main/java/org/codelibs/fess/helper/NotificationHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/OsddHelper.java b/src/main/java/org/codelibs/fess/helper/OsddHelper.java index 4f21495a95..7c821a6cf2 100644 --- a/src/main/java/org/codelibs/fess/helper/OsddHelper.java +++ b/src/main/java/org/codelibs/fess/helper/OsddHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/PathMappingHelper.java b/src/main/java/org/codelibs/fess/helper/PathMappingHelper.java index 7f031163ae..65ef22bf89 100644 --- a/src/main/java/org/codelibs/fess/helper/PathMappingHelper.java +++ b/src/main/java/org/codelibs/fess/helper/PathMappingHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/PermissionHelper.java b/src/main/java/org/codelibs/fess/helper/PermissionHelper.java index eae17fec55..d31a9018d2 100644 --- a/src/main/java/org/codelibs/fess/helper/PermissionHelper.java +++ b/src/main/java/org/codelibs/fess/helper/PermissionHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/PluginHelper.java b/src/main/java/org/codelibs/fess/helper/PluginHelper.java index eccdceb682..f5a9104327 100644 --- a/src/main/java/org/codelibs/fess/helper/PluginHelper.java +++ b/src/main/java/org/codelibs/fess/helper/PluginHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/PopularWordHelper.java b/src/main/java/org/codelibs/fess/helper/PopularWordHelper.java index 1f79405084..264b3d179e 100644 --- a/src/main/java/org/codelibs/fess/helper/PopularWordHelper.java +++ b/src/main/java/org/codelibs/fess/helper/PopularWordHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/ProcessHelper.java b/src/main/java/org/codelibs/fess/helper/ProcessHelper.java index 4a98d0380d..714b3742d8 100644 --- a/src/main/java/org/codelibs/fess/helper/ProcessHelper.java +++ b/src/main/java/org/codelibs/fess/helper/ProcessHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/QueryHelper.java b/src/main/java/org/codelibs/fess/helper/QueryHelper.java index a2aa5a572c..97194142cb 100644 --- a/src/main/java/org/codelibs/fess/helper/QueryHelper.java +++ b/src/main/java/org/codelibs/fess/helper/QueryHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/RelatedContentHelper.java b/src/main/java/org/codelibs/fess/helper/RelatedContentHelper.java index 436a228250..a82054943c 100644 --- a/src/main/java/org/codelibs/fess/helper/RelatedContentHelper.java +++ b/src/main/java/org/codelibs/fess/helper/RelatedContentHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/RelatedQueryHelper.java b/src/main/java/org/codelibs/fess/helper/RelatedQueryHelper.java index b4c67a9900..35fdd35d12 100644 --- a/src/main/java/org/codelibs/fess/helper/RelatedQueryHelper.java +++ b/src/main/java/org/codelibs/fess/helper/RelatedQueryHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/RoleQueryHelper.java b/src/main/java/org/codelibs/fess/helper/RoleQueryHelper.java index 3095c1cf42..81c82744de 100644 --- a/src/main/java/org/codelibs/fess/helper/RoleQueryHelper.java +++ b/src/main/java/org/codelibs/fess/helper/RoleQueryHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/SambaHelper.java b/src/main/java/org/codelibs/fess/helper/SambaHelper.java index ef60cc642f..c3acd1926b 100644 --- a/src/main/java/org/codelibs/fess/helper/SambaHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SambaHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/SearchHelper.java b/src/main/java/org/codelibs/fess/helper/SearchHelper.java index 630a4d43c6..f2cf74ed7f 100644 --- a/src/main/java/org/codelibs/fess/helper/SearchHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SearchHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java index db79677959..42b18207f0 100644 --- a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java index 713e1db053..682ae23006 100644 --- a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java index 64fab26412..b3bc871a69 100644 --- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/ThemeHelper.java b/src/main/java/org/codelibs/fess/helper/ThemeHelper.java index d203ca91f8..7e25e2c44d 100644 --- a/src/main/java/org/codelibs/fess/helper/ThemeHelper.java +++ b/src/main/java/org/codelibs/fess/helper/ThemeHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/UserAgentHelper.java b/src/main/java/org/codelibs/fess/helper/UserAgentHelper.java index 5cf303d7b9..059846898b 100644 --- a/src/main/java/org/codelibs/fess/helper/UserAgentHelper.java +++ b/src/main/java/org/codelibs/fess/helper/UserAgentHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/UserInfoHelper.java b/src/main/java/org/codelibs/fess/helper/UserInfoHelper.java index fc199c2cb3..766e4f4ee0 100644 --- a/src/main/java/org/codelibs/fess/helper/UserInfoHelper.java +++ b/src/main/java/org/codelibs/fess/helper/UserInfoHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/ViewHelper.java b/src/main/java/org/codelibs/fess/helper/ViewHelper.java index c3a2c89df2..c0b1d0a1a7 100644 --- a/src/main/java/org/codelibs/fess/helper/ViewHelper.java +++ b/src/main/java/org/codelibs/fess/helper/ViewHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/VirtualHostHelper.java b/src/main/java/org/codelibs/fess/helper/VirtualHostHelper.java index 296b43a401..e21f5b0e20 100644 --- a/src/main/java/org/codelibs/fess/helper/VirtualHostHelper.java +++ b/src/main/java/org/codelibs/fess/helper/VirtualHostHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java b/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java index e1a6e2e5d2..8e264aaea1 100644 --- a/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java +++ b/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/indexer/DocBoostMatcher.java b/src/main/java/org/codelibs/fess/indexer/DocBoostMatcher.java index 5e0891ad85..cc9878d131 100644 --- a/src/main/java/org/codelibs/fess/indexer/DocBoostMatcher.java +++ b/src/main/java/org/codelibs/fess/indexer/DocBoostMatcher.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java index b20531f200..cb6910eb51 100644 --- a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java +++ b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/ingest/IngestFactory.java b/src/main/java/org/codelibs/fess/ingest/IngestFactory.java index 1f46d1344a..6f2f36fba2 100644 --- a/src/main/java/org/codelibs/fess/ingest/IngestFactory.java +++ b/src/main/java/org/codelibs/fess/ingest/IngestFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/ingest/Ingester.java b/src/main/java/org/codelibs/fess/ingest/Ingester.java index e3f73fdc83..02e8320395 100644 --- a/src/main/java/org/codelibs/fess/ingest/Ingester.java +++ b/src/main/java/org/codelibs/fess/ingest/Ingester.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/job/AggregateLogJob.java b/src/main/java/org/codelibs/fess/job/AggregateLogJob.java index 8111ac2c38..902c60d7e4 100644 --- a/src/main/java/org/codelibs/fess/job/AggregateLogJob.java +++ b/src/main/java/org/codelibs/fess/job/AggregateLogJob.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/job/CrawlJob.java b/src/main/java/org/codelibs/fess/job/CrawlJob.java index a2fbc461d8..92b4bb2a44 100644 --- a/src/main/java/org/codelibs/fess/job/CrawlJob.java +++ b/src/main/java/org/codelibs/fess/job/CrawlJob.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/job/ExecJob.java b/src/main/java/org/codelibs/fess/job/ExecJob.java index a1e24685f7..1229ad713e 100644 --- a/src/main/java/org/codelibs/fess/job/ExecJob.java +++ b/src/main/java/org/codelibs/fess/job/ExecJob.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java b/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java index 6cc2789ba9..f353be6351 100644 --- a/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java +++ b/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/job/JobExecutor.java b/src/main/java/org/codelibs/fess/job/JobExecutor.java index 2cce364d5d..1bd2df1089 100644 --- a/src/main/java/org/codelibs/fess/job/JobExecutor.java +++ b/src/main/java/org/codelibs/fess/job/JobExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/job/PingSearchEngineJob.java b/src/main/java/org/codelibs/fess/job/PingSearchEngineJob.java index 3a8d1976a0..082a5d6aeb 100644 --- a/src/main/java/org/codelibs/fess/job/PingSearchEngineJob.java +++ b/src/main/java/org/codelibs/fess/job/PingSearchEngineJob.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/job/PurgeDocJob.java b/src/main/java/org/codelibs/fess/job/PurgeDocJob.java index 56a5977a97..1813e0ef31 100644 --- a/src/main/java/org/codelibs/fess/job/PurgeDocJob.java +++ b/src/main/java/org/codelibs/fess/job/PurgeDocJob.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/job/PurgeLogJob.java b/src/main/java/org/codelibs/fess/job/PurgeLogJob.java index 6d5c96f648..9f4b78ef38 100644 --- a/src/main/java/org/codelibs/fess/job/PurgeLogJob.java +++ b/src/main/java/org/codelibs/fess/job/PurgeLogJob.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/job/PurgeThumbnailJob.java b/src/main/java/org/codelibs/fess/job/PurgeThumbnailJob.java index 069092ca1f..d7207b54b6 100644 --- a/src/main/java/org/codelibs/fess/job/PurgeThumbnailJob.java +++ b/src/main/java/org/codelibs/fess/job/PurgeThumbnailJob.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/job/PythonJob.java b/src/main/java/org/codelibs/fess/job/PythonJob.java index 0e75f65a66..b9d4249959 100644 --- a/src/main/java/org/codelibs/fess/job/PythonJob.java +++ b/src/main/java/org/codelibs/fess/job/PythonJob.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/job/SuggestJob.java b/src/main/java/org/codelibs/fess/job/SuggestJob.java index 62e3a2a159..496c665205 100644 --- a/src/main/java/org/codelibs/fess/job/SuggestJob.java +++ b/src/main/java/org/codelibs/fess/job/SuggestJob.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java b/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java index b2444d5868..7d20dd700a 100644 --- a/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java +++ b/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/job/impl/ScriptExecutor.java b/src/main/java/org/codelibs/fess/job/impl/ScriptExecutor.java index d05b43e362..1be878b1fb 100644 --- a/src/main/java/org/codelibs/fess/job/impl/ScriptExecutor.java +++ b/src/main/java/org/codelibs/fess/job/impl/ScriptExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/ldap/LdapManager.java b/src/main/java/org/codelibs/fess/ldap/LdapManager.java index 37e00d7c96..4b77968216 100644 --- a/src/main/java/org/codelibs/fess/ldap/LdapManager.java +++ b/src/main/java/org/codelibs/fess/ldap/LdapManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/ldap/LdapUser.java b/src/main/java/org/codelibs/fess/ldap/LdapUser.java index 58ec0f1a55..1647071eb5 100644 --- a/src/main/java/org/codelibs/fess/ldap/LdapUser.java +++ b/src/main/java/org/codelibs/fess/ldap/LdapUser.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 98027a998d..2042a4ff8f 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java index 76c8c27175..a0ba24926f 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java b/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java index 2e243a4e18..1a0cb8cd41 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 246533e027..dc88b4d402 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessUserBean.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessUserBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/mylasta/creator/PagerCreator.java b/src/main/java/org/codelibs/fess/mylasta/creator/PagerCreator.java index d3c718c13a..0411afc9e8 100644 --- a/src/main/java/org/codelibs/fess/mylasta/creator/PagerCreator.java +++ b/src/main/java/org/codelibs/fess/mylasta/creator/PagerCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 1785c37a1a..bf692b67dd 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfigImpl.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfigImpl.java index 545088f122..223c78104a 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfigImpl.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfigImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessEnv.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessEnv.java index d797471843..492df09a29 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessEnv.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessEnv.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessFwAssistantDirector.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessFwAssistantDirector.java index dc67e1382e..cb8bf0aa74 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessFwAssistantDirector.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessFwAssistantDirector.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 bf6fea82a6..dcfc274d8a 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 59bec3399a..442dc38075 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessApiFailureHook.java b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessApiFailureHook.java index 5b3b640592..78ed6d7dba 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessApiFailureHook.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessApiFailureHook.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessCookieResourceProvider.java b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessCookieResourceProvider.java index 27ae4a98cf..d1f996510d 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessCookieResourceProvider.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessCookieResourceProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessCurtainBeforeHook.java b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessCurtainBeforeHook.java index 81009cd6d2..831473dfda 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessCurtainBeforeHook.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessCurtainBeforeHook.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessCurtainFinallyHook.java b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessCurtainFinallyHook.java index bd05514f8c..5839fca01e 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessCurtainFinallyHook.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessCurtainFinallyHook.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessJsonResourceProvider.java b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessJsonResourceProvider.java index 93c0dc0e9d..cc77669213 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessJsonResourceProvider.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessJsonResourceProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessListedClassificationProvider.java b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessListedClassificationProvider.java index 322ccfc666..14e31c7fba 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessListedClassificationProvider.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessListedClassificationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMailDeliveryDepartmentCreator.java b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMailDeliveryDepartmentCreator.java index b4bc75998e..65b34d5aa1 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMailDeliveryDepartmentCreator.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMailDeliveryDepartmentCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java index 6cf5945e31..24daef7177 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessSecurityResourceProvider.java b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessSecurityResourceProvider.java index 3186604345..85ad8e0253 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessSecurityResourceProvider.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessSecurityResourceProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessTimeResourceProvider.java b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessTimeResourceProvider.java index 7396bb8da7..4a5a667bf2 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessTimeResourceProvider.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessTimeResourceProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessUserLocaleProcessProvider.java b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessUserLocaleProcessProvider.java index 668a48654f..b9075fe7f9 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessUserLocaleProcessProvider.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessUserLocaleProcessProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessUserTimeZoneProcessProvider.java b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessUserTimeZoneProcessProvider.java index 7998f00232..f82e7bc188 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessUserTimeZoneProcessProvider.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessUserTimeZoneProcessProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 e114be9fba..0a4838f414 100644 --- a/src/main/java/org/codelibs/fess/mylasta/mail/CrawlerPostcard.java +++ b/src/main/java/org/codelibs/fess/mylasta/mail/CrawlerPostcard.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/mylasta/mail/EsStatusPostcard.java b/src/main/java/org/codelibs/fess/mylasta/mail/EsStatusPostcard.java index 8141f4ebf2..d7d78fc31c 100644 --- a/src/main/java/org/codelibs/fess/mylasta/mail/EsStatusPostcard.java +++ b/src/main/java/org/codelibs/fess/mylasta/mail/EsStatusPostcard.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/mylasta/mail/TestmailPostcard.java b/src/main/java/org/codelibs/fess/mylasta/mail/TestmailPostcard.java index 5721aa417b..8c92810a06 100644 --- a/src/main/java/org/codelibs/fess/mylasta/mail/TestmailPostcard.java +++ b/src/main/java/org/codelibs/fess/mylasta/mail/TestmailPostcard.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/query/BooleanQueryCommand.java b/src/main/java/org/codelibs/fess/query/BooleanQueryCommand.java index 1098cc3578..15756b0ac4 100644 --- a/src/main/java/org/codelibs/fess/query/BooleanQueryCommand.java +++ b/src/main/java/org/codelibs/fess/query/BooleanQueryCommand.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/query/BoostQueryCommand.java b/src/main/java/org/codelibs/fess/query/BoostQueryCommand.java index 8ba02bfdcd..d95109b313 100644 --- a/src/main/java/org/codelibs/fess/query/BoostQueryCommand.java +++ b/src/main/java/org/codelibs/fess/query/BoostQueryCommand.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/query/FuzzyQueryCommand.java b/src/main/java/org/codelibs/fess/query/FuzzyQueryCommand.java index e1ac129ee2..9f86940239 100644 --- a/src/main/java/org/codelibs/fess/query/FuzzyQueryCommand.java +++ b/src/main/java/org/codelibs/fess/query/FuzzyQueryCommand.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/query/MatchAllQueryCommand.java b/src/main/java/org/codelibs/fess/query/MatchAllQueryCommand.java index e0086a1523..c91aebcca8 100644 --- a/src/main/java/org/codelibs/fess/query/MatchAllQueryCommand.java +++ b/src/main/java/org/codelibs/fess/query/MatchAllQueryCommand.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/query/PhraseQueryCommand.java b/src/main/java/org/codelibs/fess/query/PhraseQueryCommand.java index 1e68c84678..09fa3d0e4e 100644 --- a/src/main/java/org/codelibs/fess/query/PhraseQueryCommand.java +++ b/src/main/java/org/codelibs/fess/query/PhraseQueryCommand.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/query/PrefixQueryCommand.java b/src/main/java/org/codelibs/fess/query/PrefixQueryCommand.java index b413d2624a..c3d1ab15bd 100644 --- a/src/main/java/org/codelibs/fess/query/PrefixQueryCommand.java +++ b/src/main/java/org/codelibs/fess/query/PrefixQueryCommand.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/query/QueryCommand.java b/src/main/java/org/codelibs/fess/query/QueryCommand.java index 55511756ac..f7ff145a52 100644 --- a/src/main/java/org/codelibs/fess/query/QueryCommand.java +++ b/src/main/java/org/codelibs/fess/query/QueryCommand.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/query/QueryFieldConfig.java b/src/main/java/org/codelibs/fess/query/QueryFieldConfig.java index 2a9f6a6a7b..b5dc1111db 100644 --- a/src/main/java/org/codelibs/fess/query/QueryFieldConfig.java +++ b/src/main/java/org/codelibs/fess/query/QueryFieldConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/query/QueryProcessor.java b/src/main/java/org/codelibs/fess/query/QueryProcessor.java index b3cb533363..9624042d32 100644 --- a/src/main/java/org/codelibs/fess/query/QueryProcessor.java +++ b/src/main/java/org/codelibs/fess/query/QueryProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/query/TermQueryCommand.java b/src/main/java/org/codelibs/fess/query/TermQueryCommand.java index 59f5cbeb2b..53641c4618 100644 --- a/src/main/java/org/codelibs/fess/query/TermQueryCommand.java +++ b/src/main/java/org/codelibs/fess/query/TermQueryCommand.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/query/TermRangeQueryCommand.java b/src/main/java/org/codelibs/fess/query/TermRangeQueryCommand.java index 3b23014ad8..5a547dcc62 100644 --- a/src/main/java/org/codelibs/fess/query/TermRangeQueryCommand.java +++ b/src/main/java/org/codelibs/fess/query/TermRangeQueryCommand.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/query/WildcardQueryCommand.java b/src/main/java/org/codelibs/fess/query/WildcardQueryCommand.java index 2f39faf5ba..7d8df8dcf6 100644 --- a/src/main/java/org/codelibs/fess/query/WildcardQueryCommand.java +++ b/src/main/java/org/codelibs/fess/query/WildcardQueryCommand.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/query/parser/QueryParser.java b/src/main/java/org/codelibs/fess/query/parser/QueryParser.java index 73e293263a..ca1b68b852 100644 --- a/src/main/java/org/codelibs/fess/query/parser/QueryParser.java +++ b/src/main/java/org/codelibs/fess/query/parser/QueryParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/rank/fusion/DefaultSearcher.java b/src/main/java/org/codelibs/fess/rank/fusion/DefaultSearcher.java index a2a80b5350..5a6c938161 100644 --- a/src/main/java/org/codelibs/fess/rank/fusion/DefaultSearcher.java +++ b/src/main/java/org/codelibs/fess/rank/fusion/DefaultSearcher.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/rank/fusion/RankFusionProcessor.java b/src/main/java/org/codelibs/fess/rank/fusion/RankFusionProcessor.java index ccc13336ad..3b745baec4 100644 --- a/src/main/java/org/codelibs/fess/rank/fusion/RankFusionProcessor.java +++ b/src/main/java/org/codelibs/fess/rank/fusion/RankFusionProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/rank/fusion/RankFusionSearcher.java b/src/main/java/org/codelibs/fess/rank/fusion/RankFusionSearcher.java index 5160a1ffbf..740e7bd377 100644 --- a/src/main/java/org/codelibs/fess/rank/fusion/RankFusionSearcher.java +++ b/src/main/java/org/codelibs/fess/rank/fusion/RankFusionSearcher.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/rank/fusion/SearchResult.java b/src/main/java/org/codelibs/fess/rank/fusion/SearchResult.java index 406461c6e9..2d32495d8b 100644 --- a/src/main/java/org/codelibs/fess/rank/fusion/SearchResult.java +++ b/src/main/java/org/codelibs/fess/rank/fusion/SearchResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java b/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java index a4b491c791..0be0a00637 100644 --- a/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java +++ b/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/score/QueryRescorer.java b/src/main/java/org/codelibs/fess/score/QueryRescorer.java index 4a9a8b5516..84e6e98993 100644 --- a/src/main/java/org/codelibs/fess/score/QueryRescorer.java +++ b/src/main/java/org/codelibs/fess/score/QueryRescorer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/score/ScoreBooster.java b/src/main/java/org/codelibs/fess/score/ScoreBooster.java index 14ad42ea76..93626a4a10 100644 --- a/src/main/java/org/codelibs/fess/score/ScoreBooster.java +++ b/src/main/java/org/codelibs/fess/score/ScoreBooster.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/score/ScoreUpdater.java b/src/main/java/org/codelibs/fess/score/ScoreUpdater.java index 0a456c5104..559fc58b7f 100644 --- a/src/main/java/org/codelibs/fess/score/ScoreUpdater.java +++ b/src/main/java/org/codelibs/fess/score/ScoreUpdater.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/script/AbstractScriptEngine.java b/src/main/java/org/codelibs/fess/script/AbstractScriptEngine.java index 53b50d2863..af1f032b1b 100644 --- a/src/main/java/org/codelibs/fess/script/AbstractScriptEngine.java +++ b/src/main/java/org/codelibs/fess/script/AbstractScriptEngine.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/script/ScriptEngine.java b/src/main/java/org/codelibs/fess/script/ScriptEngine.java index d4cea5fbe9..bbe6088f24 100644 --- a/src/main/java/org/codelibs/fess/script/ScriptEngine.java +++ b/src/main/java/org/codelibs/fess/script/ScriptEngine.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/script/ScriptEngineFactory.java b/src/main/java/org/codelibs/fess/script/ScriptEngineFactory.java index 2eb24dddeb..680bd2f331 100644 --- a/src/main/java/org/codelibs/fess/script/ScriptEngineFactory.java +++ b/src/main/java/org/codelibs/fess/script/ScriptEngineFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/sso/SsoAuthenticator.java b/src/main/java/org/codelibs/fess/sso/SsoAuthenticator.java index 2c51a575f6..dd7fa05579 100644 --- a/src/main/java/org/codelibs/fess/sso/SsoAuthenticator.java +++ b/src/main/java/org/codelibs/fess/sso/SsoAuthenticator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/sso/SsoManager.java b/src/main/java/org/codelibs/fess/sso/SsoManager.java index 364b86b55b..452af5356a 100644 --- a/src/main/java/org/codelibs/fess/sso/SsoManager.java +++ b/src/main/java/org/codelibs/fess/sso/SsoManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/sso/SsoResponseType.java b/src/main/java/org/codelibs/fess/sso/SsoResponseType.java index 1e4afea53d..21e617bc69 100644 --- a/src/main/java/org/codelibs/fess/sso/SsoResponseType.java +++ b/src/main/java/org/codelibs/fess/sso/SsoResponseType.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 3dc015ac69..31b6cadeec 100644 --- a/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java +++ b/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java b/src/main/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java index d651aee1de..5db70ac683 100644 --- a/src/main/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java +++ b/src/main/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 2af4eb6dde..e9594dccb5 100644 --- a/src/main/java/org/codelibs/fess/sso/saml/SamlAuthenticator.java +++ b/src/main/java/org/codelibs/fess/sso/saml/SamlAuthenticator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 6f1f13f086..fbcd8582d6 100644 --- a/src/main/java/org/codelibs/fess/sso/spnego/SpnegoAuthenticator.java +++ b/src/main/java/org/codelibs/fess/sso/spnego/SpnegoAuthenticator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java index 0665992052..5afb611d6c 100644 --- a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java +++ b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailGenerator.java b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailGenerator.java index 08a1a3ea75..32dd466eef 100644 --- a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailGenerator.java +++ b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java index 5309dc230c..0bfd711ebe 100644 --- a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java +++ b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 dbbadfe304..20805ee188 100644 --- a/src/main/java/org/codelibs/fess/thumbnail/impl/BaseThumbnailGenerator.java +++ b/src/main/java/org/codelibs/fess/thumbnail/impl/BaseThumbnailGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java b/src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java index eb7fb55eef..90a86378af 100644 --- a/src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java +++ b/src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/thumbnail/impl/EmptyGenerator.java b/src/main/java/org/codelibs/fess/thumbnail/impl/EmptyGenerator.java index 143bede72f..5280f25c12 100644 --- a/src/main/java/org/codelibs/fess/thumbnail/impl/EmptyGenerator.java +++ b/src/main/java/org/codelibs/fess/thumbnail/impl/EmptyGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 1c6caf38c3..3f92dfc028 100644 --- a/src/main/java/org/codelibs/fess/thumbnail/impl/HtmlTagBasedGenerator.java +++ b/src/main/java/org/codelibs/fess/thumbnail/impl/HtmlTagBasedGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/timer/HotThreadMonitorTarget.java b/src/main/java/org/codelibs/fess/timer/HotThreadMonitorTarget.java index d9e605b920..8afe9c3fc9 100644 --- a/src/main/java/org/codelibs/fess/timer/HotThreadMonitorTarget.java +++ b/src/main/java/org/codelibs/fess/timer/HotThreadMonitorTarget.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/timer/MonitorTarget.java b/src/main/java/org/codelibs/fess/timer/MonitorTarget.java index 4b22f0de62..e6749551c5 100644 --- a/src/main/java/org/codelibs/fess/timer/MonitorTarget.java +++ b/src/main/java/org/codelibs/fess/timer/MonitorTarget.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java b/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java index 92b435233d..58149ba31f 100644 --- a/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java +++ b/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/tomcat/valve/SuppressErrorReportValve.java b/src/main/java/org/codelibs/fess/tomcat/valve/SuppressErrorReportValve.java index 3d0ba8ea88..a793bac7cd 100644 --- a/src/main/java/org/codelibs/fess/tomcat/valve/SuppressErrorReportValve.java +++ b/src/main/java/org/codelibs/fess/tomcat/valve/SuppressErrorReportValve.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/tomcat/webresources/FessWebResourceRoot.java b/src/main/java/org/codelibs/fess/tomcat/webresources/FessWebResourceRoot.java index bcd25c5fe2..184cbb8f18 100644 --- a/src/main/java/org/codelibs/fess/tomcat/webresources/FessWebResourceRoot.java +++ b/src/main/java/org/codelibs/fess/tomcat/webresources/FessWebResourceRoot.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/BooleanFunction.java b/src/main/java/org/codelibs/fess/util/BooleanFunction.java index 8a24fa7594..3bed141a2c 100644 --- a/src/main/java/org/codelibs/fess/util/BooleanFunction.java +++ b/src/main/java/org/codelibs/fess/util/BooleanFunction.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/ComponentUtil.java b/src/main/java/org/codelibs/fess/util/ComponentUtil.java index b5427d5f95..e2ef4287ae 100644 --- a/src/main/java/org/codelibs/fess/util/ComponentUtil.java +++ b/src/main/java/org/codelibs/fess/util/ComponentUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/DocList.java b/src/main/java/org/codelibs/fess/util/DocList.java index 86fc335fc4..65b23a484c 100644 --- a/src/main/java/org/codelibs/fess/util/DocList.java +++ b/src/main/java/org/codelibs/fess/util/DocList.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/DocMap.java b/src/main/java/org/codelibs/fess/util/DocMap.java index 6437864c03..a0f8223de1 100644 --- a/src/main/java/org/codelibs/fess/util/DocMap.java +++ b/src/main/java/org/codelibs/fess/util/DocMap.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/DocumentUtil.java b/src/main/java/org/codelibs/fess/util/DocumentUtil.java index 30994b3931..ab6ea71a36 100644 --- a/src/main/java/org/codelibs/fess/util/DocumentUtil.java +++ b/src/main/java/org/codelibs/fess/util/DocumentUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/ErrorToWarnRewritePolicy.java b/src/main/java/org/codelibs/fess/util/ErrorToWarnRewritePolicy.java index b4a03ea506..5073b52677 100644 --- a/src/main/java/org/codelibs/fess/util/ErrorToWarnRewritePolicy.java +++ b/src/main/java/org/codelibs/fess/util/ErrorToWarnRewritePolicy.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/FacetResponse.java b/src/main/java/org/codelibs/fess/util/FacetResponse.java index c0c2d47094..fed8b40af5 100644 --- a/src/main/java/org/codelibs/fess/util/FacetResponse.java +++ b/src/main/java/org/codelibs/fess/util/FacetResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/GsaConfigParser.java b/src/main/java/org/codelibs/fess/util/GsaConfigParser.java index 8d0d0d246f..0ed3a3f8c0 100644 --- a/src/main/java/org/codelibs/fess/util/GsaConfigParser.java +++ b/src/main/java/org/codelibs/fess/util/GsaConfigParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/InputStreamThread.java b/src/main/java/org/codelibs/fess/util/InputStreamThread.java index 62fb03de56..91640a5afb 100644 --- a/src/main/java/org/codelibs/fess/util/InputStreamThread.java +++ b/src/main/java/org/codelibs/fess/util/InputStreamThread.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/JobProcess.java b/src/main/java/org/codelibs/fess/util/JobProcess.java index 5555b3e169..0e4d84dbbc 100644 --- a/src/main/java/org/codelibs/fess/util/JobProcess.java +++ b/src/main/java/org/codelibs/fess/util/JobProcess.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/JvmUtil.java b/src/main/java/org/codelibs/fess/util/JvmUtil.java index 9b2ab69359..73de0184c5 100644 --- a/src/main/java/org/codelibs/fess/util/JvmUtil.java +++ b/src/main/java/org/codelibs/fess/util/JvmUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/KuromojiCSVUtil.java b/src/main/java/org/codelibs/fess/util/KuromojiCSVUtil.java index 093330d6ed..1b08e4607f 100644 --- a/src/main/java/org/codelibs/fess/util/KuromojiCSVUtil.java +++ b/src/main/java/org/codelibs/fess/util/KuromojiCSVUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/MemoryUtil.java b/src/main/java/org/codelibs/fess/util/MemoryUtil.java index 7a3fb0effd..64bf532480 100644 --- a/src/main/java/org/codelibs/fess/util/MemoryUtil.java +++ b/src/main/java/org/codelibs/fess/util/MemoryUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/OptionalUtil.java b/src/main/java/org/codelibs/fess/util/OptionalUtil.java index 6ccfddff02..c6bd478749 100644 --- a/src/main/java/org/codelibs/fess/util/OptionalUtil.java +++ b/src/main/java/org/codelibs/fess/util/OptionalUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/ParameterUtil.java b/src/main/java/org/codelibs/fess/util/ParameterUtil.java index 01aa67054a..6402f20e25 100644 --- a/src/main/java/org/codelibs/fess/util/ParameterUtil.java +++ b/src/main/java/org/codelibs/fess/util/ParameterUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/PrunedTag.java b/src/main/java/org/codelibs/fess/util/PrunedTag.java index d9ad33646e..9e712e8114 100644 --- a/src/main/java/org/codelibs/fess/util/PrunedTag.java +++ b/src/main/java/org/codelibs/fess/util/PrunedTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/QueryResponseList.java b/src/main/java/org/codelibs/fess/util/QueryResponseList.java index 14f7415d9e..df361bf840 100644 --- a/src/main/java/org/codelibs/fess/util/QueryResponseList.java +++ b/src/main/java/org/codelibs/fess/util/QueryResponseList.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/QueryStringBuilder.java b/src/main/java/org/codelibs/fess/util/QueryStringBuilder.java index 4f53f0e018..bda20fb107 100644 --- a/src/main/java/org/codelibs/fess/util/QueryStringBuilder.java +++ b/src/main/java/org/codelibs/fess/util/QueryStringBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/RenderDataUtil.java b/src/main/java/org/codelibs/fess/util/RenderDataUtil.java index 3e4dd37740..95442258ab 100644 --- a/src/main/java/org/codelibs/fess/util/RenderDataUtil.java +++ b/src/main/java/org/codelibs/fess/util/RenderDataUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/ResourceUtil.java b/src/main/java/org/codelibs/fess/util/ResourceUtil.java index fd0b7d1de7..63248858bd 100644 --- a/src/main/java/org/codelibs/fess/util/ResourceUtil.java +++ b/src/main/java/org/codelibs/fess/util/ResourceUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/SearchEngineUtil.java b/src/main/java/org/codelibs/fess/util/SearchEngineUtil.java index 590cac3bcb..d7971403ed 100644 --- a/src/main/java/org/codelibs/fess/util/SearchEngineUtil.java +++ b/src/main/java/org/codelibs/fess/util/SearchEngineUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/SystemUtil.java b/src/main/java/org/codelibs/fess/util/SystemUtil.java index 1439e3f12f..a0bc3eceaf 100644 --- a/src/main/java/org/codelibs/fess/util/SystemUtil.java +++ b/src/main/java/org/codelibs/fess/util/SystemUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/ThreadDumpUtil.java b/src/main/java/org/codelibs/fess/util/ThreadDumpUtil.java index 4961a0854e..01799c134c 100644 --- a/src/main/java/org/codelibs/fess/util/ThreadDumpUtil.java +++ b/src/main/java/org/codelibs/fess/util/ThreadDumpUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/UpgradeUtil.java b/src/main/java/org/codelibs/fess/util/UpgradeUtil.java index 00d4a65e94..f8007276c2 100644 --- a/src/main/java/org/codelibs/fess/util/UpgradeUtil.java +++ b/src/main/java/org/codelibs/fess/util/UpgradeUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/util/WebApiUtil.java b/src/main/java/org/codelibs/fess/util/WebApiUtil.java index 07171a4a7b..d7783d0b7c 100644 --- a/src/main/java/org/codelibs/fess/util/WebApiUtil.java +++ b/src/main/java/org/codelibs/fess/util/WebApiUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/validation/CronExpression.java b/src/main/java/org/codelibs/fess/validation/CronExpression.java index 69e9f7120c..1a72e0f0b4 100644 --- a/src/main/java/org/codelibs/fess/validation/CronExpression.java +++ b/src/main/java/org/codelibs/fess/validation/CronExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/validation/CronExpressionValidator.java b/src/main/java/org/codelibs/fess/validation/CronExpressionValidator.java index ea859be0ce..7a467910e4 100644 --- a/src/main/java/org/codelibs/fess/validation/CronExpressionValidator.java +++ b/src/main/java/org/codelibs/fess/validation/CronExpressionValidator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/validation/CustomSize.java b/src/main/java/org/codelibs/fess/validation/CustomSize.java index 5b2e5a67e1..1d6d325a39 100644 --- a/src/main/java/org/codelibs/fess/validation/CustomSize.java +++ b/src/main/java/org/codelibs/fess/validation/CustomSize.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/validation/CustomSizeValidator.java b/src/main/java/org/codelibs/fess/validation/CustomSizeValidator.java index 85e6f7bc36..136a11a33c 100644 --- a/src/main/java/org/codelibs/fess/validation/CustomSizeValidator.java +++ b/src/main/java/org/codelibs/fess/validation/CustomSizeValidator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/validation/FessActionValidator.java b/src/main/java/org/codelibs/fess/validation/FessActionValidator.java index 34b27fed8f..c63b33af4a 100644 --- a/src/main/java/org/codelibs/fess/validation/FessActionValidator.java +++ b/src/main/java/org/codelibs/fess/validation/FessActionValidator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/validation/UriType.java b/src/main/java/org/codelibs/fess/validation/UriType.java index 9f99fd363a..fd681614e1 100644 --- a/src/main/java/org/codelibs/fess/validation/UriType.java +++ b/src/main/java/org/codelibs/fess/validation/UriType.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/org/codelibs/fess/validation/UriTypeValidator.java b/src/main/java/org/codelibs/fess/validation/UriTypeValidator.java index 91f80aa323..b5e63f518c 100644 --- a/src/main/java/org/codelibs/fess/validation/UriTypeValidator.java +++ b/src/main/java/org/codelibs/fess/validation/UriTypeValidator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/app/pager/AccessTokenPagerTest.java b/src/test/java/org/codelibs/fess/app/pager/AccessTokenPagerTest.java index 93a23cb8ca..ac4c009871 100644 --- a/src/test/java/org/codelibs/fess/app/pager/AccessTokenPagerTest.java +++ b/src/test/java/org/codelibs/fess/app/pager/AccessTokenPagerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/app/pager/BadWordPagerTest.java b/src/test/java/org/codelibs/fess/app/pager/BadWordPagerTest.java index 76ba2d0869..18b69374a5 100644 --- a/src/test/java/org/codelibs/fess/app/pager/BadWordPagerTest.java +++ b/src/test/java/org/codelibs/fess/app/pager/BadWordPagerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/app/pager/BoostDocPagerTest.java b/src/test/java/org/codelibs/fess/app/pager/BoostDocPagerTest.java index 39030fa86e..d8b8938a59 100644 --- a/src/test/java/org/codelibs/fess/app/pager/BoostDocPagerTest.java +++ b/src/test/java/org/codelibs/fess/app/pager/BoostDocPagerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/app/pager/CharMappingPagerTest.java b/src/test/java/org/codelibs/fess/app/pager/CharMappingPagerTest.java index 5f61b7a1f0..f590c0370d 100644 --- a/src/test/java/org/codelibs/fess/app/pager/CharMappingPagerTest.java +++ b/src/test/java/org/codelibs/fess/app/pager/CharMappingPagerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/app/pager/CrawlingInfoPagerTest.java b/src/test/java/org/codelibs/fess/app/pager/CrawlingInfoPagerTest.java index 6ab0d91b58..bded3baf13 100644 --- a/src/test/java/org/codelibs/fess/app/pager/CrawlingInfoPagerTest.java +++ b/src/test/java/org/codelibs/fess/app/pager/CrawlingInfoPagerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/app/pager/DataConfigPagerTest.java b/src/test/java/org/codelibs/fess/app/pager/DataConfigPagerTest.java index 9e2ea54788..7867ff44b5 100644 --- a/src/test/java/org/codelibs/fess/app/pager/DataConfigPagerTest.java +++ b/src/test/java/org/codelibs/fess/app/pager/DataConfigPagerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/app/pager/DuplicateHostPagerTest.java b/src/test/java/org/codelibs/fess/app/pager/DuplicateHostPagerTest.java index e9ede3e3df..0f263cd8b2 100644 --- a/src/test/java/org/codelibs/fess/app/pager/DuplicateHostPagerTest.java +++ b/src/test/java/org/codelibs/fess/app/pager/DuplicateHostPagerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/crawler/FessCrawlerThreadTest.java b/src/test/java/org/codelibs/fess/crawler/FessCrawlerThreadTest.java index 755e28472f..32b6a8635e 100644 --- a/src/test/java/org/codelibs/fess/crawler/FessCrawlerThreadTest.java +++ b/src/test/java/org/codelibs/fess/crawler/FessCrawlerThreadTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/crawler/transformer/FessFileTransformerTest.java b/src/test/java/org/codelibs/fess/crawler/transformer/FessFileTransformerTest.java index e26ddca50b..5de72b8342 100644 --- a/src/test/java/org/codelibs/fess/crawler/transformer/FessFileTransformerTest.java +++ b/src/test/java/org/codelibs/fess/crawler/transformer/FessFileTransformerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 2eb5db5770..6d5776adc6 100644 --- a/src/test/java/org/codelibs/fess/crawler/transformer/FessXpathTransformerTest.java +++ b/src/test/java/org/codelibs/fess/crawler/transformer/FessXpathTransformerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/dict/DictionaryManagerTest.java b/src/test/java/org/codelibs/fess/dict/DictionaryManagerTest.java index dd432fb671..28bbb668ec 100644 --- a/src/test/java/org/codelibs/fess/dict/DictionaryManagerTest.java +++ b/src/test/java/org/codelibs/fess/dict/DictionaryManagerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/dict/kuromoji/KuromojiFileTest.java b/src/test/java/org/codelibs/fess/dict/kuromoji/KuromojiFileTest.java index 14be12415e..abb721cf4b 100644 --- a/src/test/java/org/codelibs/fess/dict/kuromoji/KuromojiFileTest.java +++ b/src/test/java/org/codelibs/fess/dict/kuromoji/KuromojiFileTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/dict/kuromoji/KuromojiItemTest.java b/src/test/java/org/codelibs/fess/dict/kuromoji/KuromojiItemTest.java index 9bef2b6dcb..e8d8d29058 100644 --- a/src/test/java/org/codelibs/fess/dict/kuromoji/KuromojiItemTest.java +++ b/src/test/java/org/codelibs/fess/dict/kuromoji/KuromojiItemTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideFileTest.java b/src/test/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideFileTest.java index 4d9cfb282f..86d6306a3a 100644 --- a/src/test/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideFileTest.java +++ b/src/test/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideFileTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideItemTest.java b/src/test/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideItemTest.java index 22ea0add9d..e4bfd79aca 100644 --- a/src/test/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideItemTest.java +++ b/src/test/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideItemTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/dict/synonym/SynonymFileTest.java b/src/test/java/org/codelibs/fess/dict/synonym/SynonymFileTest.java index 44f7b627b3..6fbed6df87 100644 --- a/src/test/java/org/codelibs/fess/dict/synonym/SynonymFileTest.java +++ b/src/test/java/org/codelibs/fess/dict/synonym/SynonymFileTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/dict/synonym/SynonymItemTest.java b/src/test/java/org/codelibs/fess/dict/synonym/SynonymItemTest.java index 5d634d2442..e35675d751 100644 --- a/src/test/java/org/codelibs/fess/dict/synonym/SynonymItemTest.java +++ b/src/test/java/org/codelibs/fess/dict/synonym/SynonymItemTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/ds/AbstractDataStoreTest.java b/src/test/java/org/codelibs/fess/ds/AbstractDataStoreTest.java index 110bfd6581..91a262b3c2 100644 --- a/src/test/java/org/codelibs/fess/ds/AbstractDataStoreTest.java +++ b/src/test/java/org/codelibs/fess/ds/AbstractDataStoreTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/entity/GeoInfoTest.java b/src/test/java/org/codelibs/fess/entity/GeoInfoTest.java index 16ed73bff1..5221c1c377 100644 --- a/src/test/java/org/codelibs/fess/entity/GeoInfoTest.java +++ b/src/test/java/org/codelibs/fess/entity/GeoInfoTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/entity/ParamMapTest.java b/src/test/java/org/codelibs/fess/entity/ParamMapTest.java index c2316321e6..2a54b6a5ed 100644 --- a/src/test/java/org/codelibs/fess/entity/ParamMapTest.java +++ b/src/test/java/org/codelibs/fess/entity/ParamMapTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/es/config/exentity/WebConfigTest.java b/src/test/java/org/codelibs/fess/es/config/exentity/WebConfigTest.java index 25dba44123..b8273e73e3 100644 --- a/src/test/java/org/codelibs/fess/es/config/exentity/WebConfigTest.java +++ b/src/test/java/org/codelibs/fess/es/config/exentity/WebConfigTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/filter/EncodingFilterTest.java b/src/test/java/org/codelibs/fess/filter/EncodingFilterTest.java index 1d3e42a5ac..4bc576c368 100644 --- a/src/test/java/org/codelibs/fess/filter/EncodingFilterTest.java +++ b/src/test/java/org/codelibs/fess/filter/EncodingFilterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/helper/AccessTokenHelperTest.java b/src/test/java/org/codelibs/fess/helper/AccessTokenHelperTest.java index 2f1c7320dd..5a16a397c7 100644 --- a/src/test/java/org/codelibs/fess/helper/AccessTokenHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/AccessTokenHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/helper/ActivityHelperTest.java b/src/test/java/org/codelibs/fess/helper/ActivityHelperTest.java index 98600efb35..b2d17df90c 100644 --- a/src/test/java/org/codelibs/fess/helper/ActivityHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/ActivityHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/helper/CrawlerStatsHelperTest.java b/src/test/java/org/codelibs/fess/helper/CrawlerStatsHelperTest.java index 1bbdcf83d6..c66e21d4bd 100644 --- a/src/test/java/org/codelibs/fess/helper/CrawlerStatsHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/CrawlerStatsHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/helper/CrawlingConfigHelperTest.java b/src/test/java/org/codelibs/fess/helper/CrawlingConfigHelperTest.java index d58647ae96..8e92e68531 100644 --- a/src/test/java/org/codelibs/fess/helper/CrawlingConfigHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/CrawlingConfigHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/helper/CrawlingInfoHelperTest.java b/src/test/java/org/codelibs/fess/helper/CrawlingInfoHelperTest.java index 7328d67e73..5d740bcfbc 100644 --- a/src/test/java/org/codelibs/fess/helper/CrawlingInfoHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/CrawlingInfoHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/helper/DocumentHelperTest.java b/src/test/java/org/codelibs/fess/helper/DocumentHelperTest.java index ca14f33e0d..8e88c0c5b1 100644 --- a/src/test/java/org/codelibs/fess/helper/DocumentHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/DocumentHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/helper/DuplicateHostHelperTest.java b/src/test/java/org/codelibs/fess/helper/DuplicateHostHelperTest.java index 8988c5fb96..e04f8a9627 100644 --- a/src/test/java/org/codelibs/fess/helper/DuplicateHostHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/DuplicateHostHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/helper/IndexingHelperTest.java b/src/test/java/org/codelibs/fess/helper/IndexingHelperTest.java index 88fb28b556..de9143e595 100644 --- a/src/test/java/org/codelibs/fess/helper/IndexingHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/IndexingHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/helper/IntervalControlHelperTest.java b/src/test/java/org/codelibs/fess/helper/IntervalControlHelperTest.java index 73babc05c8..bde447a5c2 100644 --- a/src/test/java/org/codelibs/fess/helper/IntervalControlHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/IntervalControlHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/helper/LabelTypeHelperTest.java b/src/test/java/org/codelibs/fess/helper/LabelTypeHelperTest.java index 3918626e7a..496462a0e2 100644 --- a/src/test/java/org/codelibs/fess/helper/LabelTypeHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/LabelTypeHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/helper/LanguageHelperTest.java b/src/test/java/org/codelibs/fess/helper/LanguageHelperTest.java index 05040d290d..e7999948a9 100644 --- a/src/test/java/org/codelibs/fess/helper/LanguageHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/LanguageHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/helper/OsddHelperTest.java b/src/test/java/org/codelibs/fess/helper/OsddHelperTest.java index 1bd7e343d1..74c1ffa305 100644 --- a/src/test/java/org/codelibs/fess/helper/OsddHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/OsddHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/helper/PathMappingHelperTest.java b/src/test/java/org/codelibs/fess/helper/PathMappingHelperTest.java index 7a1a53fea4..c1d6e66e55 100644 --- a/src/test/java/org/codelibs/fess/helper/PathMappingHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/PathMappingHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/helper/PermissionHelperTest.java b/src/test/java/org/codelibs/fess/helper/PermissionHelperTest.java index 8bee73496a..7932e0b897 100644 --- a/src/test/java/org/codelibs/fess/helper/PermissionHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/PermissionHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/helper/PluginHelperTest.java b/src/test/java/org/codelibs/fess/helper/PluginHelperTest.java index a32d07ac8f..71cfca9c2c 100644 --- a/src/test/java/org/codelibs/fess/helper/PluginHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/PluginHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java b/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java index 84c9b88a7b..2e586d6a01 100644 --- a/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/helper/RoleQueryHelperTest.java b/src/test/java/org/codelibs/fess/helper/RoleQueryHelperTest.java index 92fcd5386d..a1aebaa48e 100644 --- a/src/test/java/org/codelibs/fess/helper/RoleQueryHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/RoleQueryHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/helper/SystemHelperTest.java b/src/test/java/org/codelibs/fess/helper/SystemHelperTest.java index c02b72dadc..29e20b0adf 100644 --- a/src/test/java/org/codelibs/fess/helper/SystemHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/SystemHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/helper/UserAgentHelperTest.java b/src/test/java/org/codelibs/fess/helper/UserAgentHelperTest.java index f5190de7fe..404b2d4068 100644 --- a/src/test/java/org/codelibs/fess/helper/UserAgentHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/UserAgentHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/helper/UserInfoHelperTest.java b/src/test/java/org/codelibs/fess/helper/UserInfoHelperTest.java index baf97b96c3..76a13f0eb6 100644 --- a/src/test/java/org/codelibs/fess/helper/UserInfoHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/UserInfoHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/helper/ViewHelperTest.java b/src/test/java/org/codelibs/fess/helper/ViewHelperTest.java index 2a40969237..5b550e0515 100644 --- a/src/test/java/org/codelibs/fess/helper/ViewHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/ViewHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/indexer/DocBoostMatcherTest.java b/src/test/java/org/codelibs/fess/indexer/DocBoostMatcherTest.java index b3ca24a4e8..6cde632ca4 100644 --- a/src/test/java/org/codelibs/fess/indexer/DocBoostMatcherTest.java +++ b/src/test/java/org/codelibs/fess/indexer/DocBoostMatcherTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/ingest/IngestFactoryTest.java b/src/test/java/org/codelibs/fess/ingest/IngestFactoryTest.java index 3104ac55c4..90f35bd2db 100644 --- a/src/test/java/org/codelibs/fess/ingest/IngestFactoryTest.java +++ b/src/test/java/org/codelibs/fess/ingest/IngestFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/CrawlTestBase.java b/src/test/java/org/codelibs/fess/it/CrawlTestBase.java index ab49df7c97..3314d7fe9f 100644 --- a/src/test/java/org/codelibs/fess/it/CrawlTestBase.java +++ b/src/test/java/org/codelibs/fess/it/CrawlTestBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/CrudTestBase.java b/src/test/java/org/codelibs/fess/it/CrudTestBase.java index 01d0e827ef..5e53b2f6e2 100644 --- a/src/test/java/org/codelibs/fess/it/CrudTestBase.java +++ b/src/test/java/org/codelibs/fess/it/CrudTestBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/ITBase.java b/src/test/java/org/codelibs/fess/it/ITBase.java index 62b3b9112c..75711a0d7c 100644 --- a/src/test/java/org/codelibs/fess/it/ITBase.java +++ b/src/test/java/org/codelibs/fess/it/ITBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/AccessTokenTests.java b/src/test/java/org/codelibs/fess/it/admin/AccessTokenTests.java index 1c33e27005..6d5724c76a 100644 --- a/src/test/java/org/codelibs/fess/it/admin/AccessTokenTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/AccessTokenTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/BackupTests.java b/src/test/java/org/codelibs/fess/it/admin/BackupTests.java index a695384cea..a2e6c46d68 100644 --- a/src/test/java/org/codelibs/fess/it/admin/BackupTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/BackupTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/BadWordTests.java b/src/test/java/org/codelibs/fess/it/admin/BadWordTests.java index 2d21d9c12d..2e6d5a0fd6 100644 --- a/src/test/java/org/codelibs/fess/it/admin/BadWordTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/BadWordTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/BoostDocTests.java b/src/test/java/org/codelibs/fess/it/admin/BoostDocTests.java index 0002914414..26b8f4c225 100644 --- a/src/test/java/org/codelibs/fess/it/admin/BoostDocTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/BoostDocTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/CrawlerLogTests.java b/src/test/java/org/codelibs/fess/it/admin/CrawlerLogTests.java index 987140a8f4..4497b4f77a 100644 --- a/src/test/java/org/codelibs/fess/it/admin/CrawlerLogTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/CrawlerLogTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/DataConfigTests.java b/src/test/java/org/codelibs/fess/it/admin/DataConfigTests.java index 7894547591..574814d449 100644 --- a/src/test/java/org/codelibs/fess/it/admin/DataConfigTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/DataConfigTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/DuplicateHostTests.java b/src/test/java/org/codelibs/fess/it/admin/DuplicateHostTests.java index e37119a166..12647eea84 100644 --- a/src/test/java/org/codelibs/fess/it/admin/DuplicateHostTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/DuplicateHostTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/ElevateWordTests.java b/src/test/java/org/codelibs/fess/it/admin/ElevateWordTests.java index c107869f58..44daf77c01 100644 --- a/src/test/java/org/codelibs/fess/it/admin/ElevateWordTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/ElevateWordTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/FileAuthTests.java b/src/test/java/org/codelibs/fess/it/admin/FileAuthTests.java index 82fcd93c3c..103ef48b70 100644 --- a/src/test/java/org/codelibs/fess/it/admin/FileAuthTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/FileAuthTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/FileConfigTests.java b/src/test/java/org/codelibs/fess/it/admin/FileConfigTests.java index 0e3fba69f8..0b5affd476 100644 --- a/src/test/java/org/codelibs/fess/it/admin/FileConfigTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/FileConfigTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/GeneralTests.java b/src/test/java/org/codelibs/fess/it/admin/GeneralTests.java index 21bf75f639..839cbd445b 100644 --- a/src/test/java/org/codelibs/fess/it/admin/GeneralTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/GeneralTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/GroupTests.java b/src/test/java/org/codelibs/fess/it/admin/GroupTests.java index e7c3220662..6512522bec 100644 --- a/src/test/java/org/codelibs/fess/it/admin/GroupTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/GroupTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/JobLogTests.java b/src/test/java/org/codelibs/fess/it/admin/JobLogTests.java index bd89ad0527..bb54e66820 100644 --- a/src/test/java/org/codelibs/fess/it/admin/JobLogTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/JobLogTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/KeyMatchTests.java b/src/test/java/org/codelibs/fess/it/admin/KeyMatchTests.java index cbdb7ff984..ed8c4fc720 100644 --- a/src/test/java/org/codelibs/fess/it/admin/KeyMatchTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/KeyMatchTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/LabelTypeTests.java b/src/test/java/org/codelibs/fess/it/admin/LabelTypeTests.java index 85adc122be..12b72cecc7 100644 --- a/src/test/java/org/codelibs/fess/it/admin/LabelTypeTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/LabelTypeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/LogTests.java b/src/test/java/org/codelibs/fess/it/admin/LogTests.java index b703625490..3e40d78078 100644 --- a/src/test/java/org/codelibs/fess/it/admin/LogTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/LogTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/PathMapTests.java b/src/test/java/org/codelibs/fess/it/admin/PathMapTests.java index f395ac009d..e57aadc723 100644 --- a/src/test/java/org/codelibs/fess/it/admin/PathMapTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/PathMapTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 c9b56ce4df..1f9da9335d 100644 --- a/src/test/java/org/codelibs/fess/it/admin/PluginTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/PluginTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/RelatedContentTests.java b/src/test/java/org/codelibs/fess/it/admin/RelatedContentTests.java index 9ab3612d56..c0ef3918a0 100644 --- a/src/test/java/org/codelibs/fess/it/admin/RelatedContentTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/RelatedContentTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/RelatedQueryTests.java b/src/test/java/org/codelibs/fess/it/admin/RelatedQueryTests.java index 1a6e57d3a0..732a9b7c79 100644 --- a/src/test/java/org/codelibs/fess/it/admin/RelatedQueryTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/RelatedQueryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/ReqHeaderTests.java b/src/test/java/org/codelibs/fess/it/admin/ReqHeaderTests.java index 23890fbe50..257e608e11 100644 --- a/src/test/java/org/codelibs/fess/it/admin/ReqHeaderTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/ReqHeaderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/RoleTests.java b/src/test/java/org/codelibs/fess/it/admin/RoleTests.java index 77bb65bdf5..b9898b587a 100644 --- a/src/test/java/org/codelibs/fess/it/admin/RoleTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/RoleTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/SchedulerTests.java b/src/test/java/org/codelibs/fess/it/admin/SchedulerTests.java index eefc4c2b36..7d2d772e87 100644 --- a/src/test/java/org/codelibs/fess/it/admin/SchedulerTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/SchedulerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/SearchListTests.java b/src/test/java/org/codelibs/fess/it/admin/SearchListTests.java index 5480be2304..664224db9e 100644 --- a/src/test/java/org/codelibs/fess/it/admin/SearchListTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/SearchListTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/StorageTests.java b/src/test/java/org/codelibs/fess/it/admin/StorageTests.java index ce3351f821..62561fe76c 100644 --- a/src/test/java/org/codelibs/fess/it/admin/StorageTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/StorageTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/SuggestTests.java b/src/test/java/org/codelibs/fess/it/admin/SuggestTests.java index 09cd4e2e9a..88fc65338d 100644 --- a/src/test/java/org/codelibs/fess/it/admin/SuggestTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/SuggestTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/SystemInfoTests.java b/src/test/java/org/codelibs/fess/it/admin/SystemInfoTests.java index c402ceeac8..ac00514c59 100644 --- a/src/test/java/org/codelibs/fess/it/admin/SystemInfoTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/SystemInfoTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/UserTests.java b/src/test/java/org/codelibs/fess/it/admin/UserTests.java index 03052587a4..473db6dda7 100644 --- a/src/test/java/org/codelibs/fess/it/admin/UserTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/UserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/WebAuthTests.java b/src/test/java/org/codelibs/fess/it/admin/WebAuthTests.java index 99f60fe429..fa85a0fc09 100644 --- a/src/test/java/org/codelibs/fess/it/admin/WebAuthTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/WebAuthTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/WebConfigTests.java b/src/test/java/org/codelibs/fess/it/admin/WebConfigTests.java index afbd540b78..2e88441f78 100644 --- a/src/test/java/org/codelibs/fess/it/admin/WebConfigTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/WebConfigTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/dict/DictCrudTestBase.java b/src/test/java/org/codelibs/fess/it/admin/dict/DictCrudTestBase.java index facd42ab1f..4063461519 100644 --- a/src/test/java/org/codelibs/fess/it/admin/dict/DictCrudTestBase.java +++ b/src/test/java/org/codelibs/fess/it/admin/dict/DictCrudTestBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/dict/DictTests.java b/src/test/java/org/codelibs/fess/it/admin/dict/DictTests.java index 56f47f2cdc..cb37e50890 100644 --- a/src/test/java/org/codelibs/fess/it/admin/dict/DictTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/dict/DictTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/dict/KuromojiTests.java b/src/test/java/org/codelibs/fess/it/admin/dict/KuromojiTests.java index ad9fbd49c5..49ee83b22c 100644 --- a/src/test/java/org/codelibs/fess/it/admin/dict/KuromojiTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/dict/KuromojiTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/dict/MappingTests.java b/src/test/java/org/codelibs/fess/it/admin/dict/MappingTests.java index 1d08f957e6..b571f6ab98 100644 --- a/src/test/java/org/codelibs/fess/it/admin/dict/MappingTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/dict/MappingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/dict/ProtwordsTests.java b/src/test/java/org/codelibs/fess/it/admin/dict/ProtwordsTests.java index 5dc48af92c..9f522b9b7f 100644 --- a/src/test/java/org/codelibs/fess/it/admin/dict/ProtwordsTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/dict/ProtwordsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/dict/StemmerOverrideTests.java b/src/test/java/org/codelibs/fess/it/admin/dict/StemmerOverrideTests.java index 6f53cd81db..fa0975ca23 100644 --- a/src/test/java/org/codelibs/fess/it/admin/dict/StemmerOverrideTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/dict/StemmerOverrideTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/dict/StopwordsTests.java b/src/test/java/org/codelibs/fess/it/admin/dict/StopwordsTests.java index 3db2fc806c..7d95d0b3b8 100644 --- a/src/test/java/org/codelibs/fess/it/admin/dict/StopwordsTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/dict/StopwordsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/it/admin/dict/SynonymTests.java b/src/test/java/org/codelibs/fess/it/admin/dict/SynonymTests.java index 551e2ae789..9872657420 100644 --- a/src/test/java/org/codelibs/fess/it/admin/dict/SynonymTests.java +++ b/src/test/java/org/codelibs/fess/it/admin/dict/SynonymTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 2212361e6c..acde7ed099 100644 --- a/src/test/java/org/codelibs/fess/it/search/SearchApiTests.java +++ b/src/test/java/org/codelibs/fess/it/search/SearchApiTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/ldap/LdapManagerTest.java b/src/test/java/org/codelibs/fess/ldap/LdapManagerTest.java index 7e045ade3a..17c84887dd 100644 --- a/src/test/java/org/codelibs/fess/ldap/LdapManagerTest.java +++ b/src/test/java/org/codelibs/fess/ldap/LdapManagerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/mylasta/FessActionDefTest.java b/src/test/java/org/codelibs/fess/mylasta/FessActionDefTest.java index a3d2f7675c..64926ac62e 100644 --- a/src/test/java/org/codelibs/fess/mylasta/FessActionDefTest.java +++ b/src/test/java/org/codelibs/fess/mylasta/FessActionDefTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/mylasta/FessLastaDocTest.java b/src/test/java/org/codelibs/fess/mylasta/FessLastaDocTest.java index 959fc3cefd..f3ff15578f 100644 --- a/src/test/java/org/codelibs/fess/mylasta/FessLastaDocTest.java +++ b/src/test/java/org/codelibs/fess/mylasta/FessLastaDocTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/mylasta/direction/FessPropTest.java b/src/test/java/org/codelibs/fess/mylasta/direction/FessPropTest.java index 0542357763..7179e399b6 100644 --- a/src/test/java/org/codelibs/fess/mylasta/direction/FessPropTest.java +++ b/src/test/java/org/codelibs/fess/mylasta/direction/FessPropTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/query/QueryCommandTest.java b/src/test/java/org/codelibs/fess/query/QueryCommandTest.java index 88dedd6d2a..f931d5f287 100644 --- a/src/test/java/org/codelibs/fess/query/QueryCommandTest.java +++ b/src/test/java/org/codelibs/fess/query/QueryCommandTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/query/QueryProcessorTest.java b/src/test/java/org/codelibs/fess/query/QueryProcessorTest.java index c56516849a..67089543f1 100644 --- a/src/test/java/org/codelibs/fess/query/QueryProcessorTest.java +++ b/src/test/java/org/codelibs/fess/query/QueryProcessorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/query/TermQueryCommandTest.java b/src/test/java/org/codelibs/fess/query/TermQueryCommandTest.java index 5eb3cffac4..a99cfc9c30 100644 --- a/src/test/java/org/codelibs/fess/query/TermQueryCommandTest.java +++ b/src/test/java/org/codelibs/fess/query/TermQueryCommandTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/query/parser/QueryParserTest.java b/src/test/java/org/codelibs/fess/query/parser/QueryParserTest.java index 253522bb45..b3d7226f30 100644 --- a/src/test/java/org/codelibs/fess/query/parser/QueryParserTest.java +++ b/src/test/java/org/codelibs/fess/query/parser/QueryParserTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/rank/fusion/RankFusionProcessorTest.java b/src/test/java/org/codelibs/fess/rank/fusion/RankFusionProcessorTest.java index 25bb1f71b9..a8973c8869 100644 --- a/src/test/java/org/codelibs/fess/rank/fusion/RankFusionProcessorTest.java +++ b/src/test/java/org/codelibs/fess/rank/fusion/RankFusionProcessorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/sso/aad/AzureAdAuthenticatorTest.java b/src/test/java/org/codelibs/fess/sso/aad/AzureAdAuthenticatorTest.java index fc6832e595..00c316d966 100644 --- a/src/test/java/org/codelibs/fess/sso/aad/AzureAdAuthenticatorTest.java +++ b/src/test/java/org/codelibs/fess/sso/aad/AzureAdAuthenticatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/taglib/FessFunctionsTest.java b/src/test/java/org/codelibs/fess/taglib/FessFunctionsTest.java index d06caaf465..8c1be79c15 100644 --- a/src/test/java/org/codelibs/fess/taglib/FessFunctionsTest.java +++ b/src/test/java/org/codelibs/fess/taglib/FessFunctionsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/thumbnail/impl/HtmlTagBasedGeneratorTest.java b/src/test/java/org/codelibs/fess/thumbnail/impl/HtmlTagBasedGeneratorTest.java index 4268435992..aad8f82ddc 100644 --- a/src/test/java/org/codelibs/fess/thumbnail/impl/HtmlTagBasedGeneratorTest.java +++ b/src/test/java/org/codelibs/fess/thumbnail/impl/HtmlTagBasedGeneratorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/unit/UnitFessTestCase.java b/src/test/java/org/codelibs/fess/unit/UnitFessTestCase.java index b42bbde63c..1a4584f441 100644 --- a/src/test/java/org/codelibs/fess/unit/UnitFessTestCase.java +++ b/src/test/java/org/codelibs/fess/unit/UnitFessTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/util/DocListTest.java b/src/test/java/org/codelibs/fess/util/DocListTest.java index 98c1c204e3..94fbad16ea 100644 --- a/src/test/java/org/codelibs/fess/util/DocListTest.java +++ b/src/test/java/org/codelibs/fess/util/DocListTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/util/DocMapTest.java b/src/test/java/org/codelibs/fess/util/DocMapTest.java index 2439f389ee..8e2abbc047 100644 --- a/src/test/java/org/codelibs/fess/util/DocMapTest.java +++ b/src/test/java/org/codelibs/fess/util/DocMapTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/util/DocumentUtilTest.java b/src/test/java/org/codelibs/fess/util/DocumentUtilTest.java index becf63d3f6..9febaa0b26 100644 --- a/src/test/java/org/codelibs/fess/util/DocumentUtilTest.java +++ b/src/test/java/org/codelibs/fess/util/DocumentUtilTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/util/GsaConfigParserTest.java b/src/test/java/org/codelibs/fess/util/GsaConfigParserTest.java index 491c15c23a..3aa8ef196f 100644 --- a/src/test/java/org/codelibs/fess/util/GsaConfigParserTest.java +++ b/src/test/java/org/codelibs/fess/util/GsaConfigParserTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/util/JvmUtilTest.java b/src/test/java/org/codelibs/fess/util/JvmUtilTest.java index a08e3f3d87..b723a6a013 100644 --- a/src/test/java/org/codelibs/fess/util/JvmUtilTest.java +++ b/src/test/java/org/codelibs/fess/util/JvmUtilTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/util/KuromojiCSVUtilTest.java b/src/test/java/org/codelibs/fess/util/KuromojiCSVUtilTest.java index 97b305eef9..3684d459d4 100644 --- a/src/test/java/org/codelibs/fess/util/KuromojiCSVUtilTest.java +++ b/src/test/java/org/codelibs/fess/util/KuromojiCSVUtilTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/util/MemoryUtilTest.java b/src/test/java/org/codelibs/fess/util/MemoryUtilTest.java index f4432810a4..7472b25c44 100644 --- a/src/test/java/org/codelibs/fess/util/MemoryUtilTest.java +++ b/src/test/java/org/codelibs/fess/util/MemoryUtilTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/util/ParameterUtilTest.java b/src/test/java/org/codelibs/fess/util/ParameterUtilTest.java index edb7d13272..242567d5a3 100644 --- a/src/test/java/org/codelibs/fess/util/ParameterUtilTest.java +++ b/src/test/java/org/codelibs/fess/util/ParameterUtilTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/util/PrunedTagTest.java b/src/test/java/org/codelibs/fess/util/PrunedTagTest.java index 6ee86df9a3..2700cd9bca 100644 --- a/src/test/java/org/codelibs/fess/util/PrunedTagTest.java +++ b/src/test/java/org/codelibs/fess/util/PrunedTagTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/util/QueryResponseListTest.java b/src/test/java/org/codelibs/fess/util/QueryResponseListTest.java index 9eac7b2783..ca400a7d7e 100644 --- a/src/test/java/org/codelibs/fess/util/QueryResponseListTest.java +++ b/src/test/java/org/codelibs/fess/util/QueryResponseListTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/util/QueryStringBuilderTest.java b/src/test/java/org/codelibs/fess/util/QueryStringBuilderTest.java index c571759cd7..e223113704 100644 --- a/src/test/java/org/codelibs/fess/util/QueryStringBuilderTest.java +++ b/src/test/java/org/codelibs/fess/util/QueryStringBuilderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/util/RenderDataUtilTest.java b/src/test/java/org/codelibs/fess/util/RenderDataUtilTest.java index 3830cf920a..fed324c989 100644 --- a/src/test/java/org/codelibs/fess/util/RenderDataUtilTest.java +++ b/src/test/java/org/codelibs/fess/util/RenderDataUtilTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/util/ResourceUtilTest.java b/src/test/java/org/codelibs/fess/util/ResourceUtilTest.java index c55a859331..a74527d190 100644 --- a/src/test/java/org/codelibs/fess/util/ResourceUtilTest.java +++ b/src/test/java/org/codelibs/fess/util/ResourceUtilTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/codelibs/fess/validation/UriTypeValidatorTest.java b/src/test/java/org/codelibs/fess/validation/UriTypeValidatorTest.java index b1b8bf4a4a..fc72f81917 100644 --- a/src/test/java/org/codelibs/fess/validation/UriTypeValidatorTest.java +++ b/src/test/java/org/codelibs/fess/validation/UriTypeValidatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 CodeLibs Project and the Others. + * Copyright 2012-2024 CodeLibs Project and the Others. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 1409cc10185a986bbb0372c3be8e153a06992eea Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 22 Feb 2024 11:17:23 +0900 Subject: [PATCH 27/69] fix #2807 Add record_count to /api/v1/popular-words API response --- src/main/java/org/codelibs/fess/api/json/SearchApiManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java b/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java index 13d572cafb..730c3ad45b 100644 --- a/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java +++ b/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java @@ -563,7 +563,7 @@ protected void processPopularWordRequest(final HttpServletRequest request, final try { final List popularWordList = popularWordHelper.getWordList(SearchRequestType.JSON, seed, tags, null, fields, StringUtil.EMPTY_STRINGS); - + buf.append("\"record_count\":").append(popularWordList.size()).append(','); buf.append("\"data\":["); boolean first1 = true; for (final String word : popularWordList) { From 4524243a62f128b81b8d0fbb43740d534e3fab43 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Fri, 22 Mar 2024 20:58:34 +0900 Subject: [PATCH 28/69] fix #2809 Update copyright year to 2024 in footer copyright notices --- src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java | 2 +- src/main/resources/fess_label.properties | 2 +- src/main/resources/fess_label_de.properties | 2 +- src/main/resources/fess_label_en.properties | 2 +- src/main/resources/fess_label_fr.properties | 2 +- src/main/resources/fess_label_ja.properties | 2 +- src/main/resources/fess_label_ko.properties | 2 +- src/main/resources/fess_label_ru.properties | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java index a0ba24926f..a1b5a7bf18 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java @@ -617,7 +617,7 @@ public class FessLabels extends UserMessages { /** The key of the message: MENU */ public static final String LABELS_SIDEBAR_MENU = "{labels.sidebar.menu}"; - /** The key of the message: &copy;2023 <a href="https://github.com/codelibs">CodeLibs Project</a>. */ + /** The key of the message: &copy;2024 <a href="https://github.com/codelibs">CodeLibs Project</a>. */ public static final String LABELS_FOOTER_COPYRIGHT = "{labels.footer.copyright}"; /** The key of the message: Search */ diff --git a/src/main/resources/fess_label.properties b/src/main/resources/fess_label.properties index 6a013d2f75..c247cb5548 100644 --- a/src/main/resources/fess_label.properties +++ b/src/main/resources/fess_label.properties @@ -197,7 +197,7 @@ labels.menu_plugin=Plugin labels.menu_storage=Storage labels.sidebar.placeholder_search=Search... labels.sidebar.menu=MENU -labels.footer.copyright=©2023 CodeLibs Project. +labels.footer.copyright=©2024 CodeLibs Project. labels.search=Search labels.similar_doc_result_status=Similar results are displayed. labels.search_result_status=Results {2} - {3} of {1} for {0} diff --git a/src/main/resources/fess_label_de.properties b/src/main/resources/fess_label_de.properties index 7d7a94c604..91f36c5dc7 100644 --- a/src/main/resources/fess_label_de.properties +++ b/src/main/resources/fess_label_de.properties @@ -186,7 +186,7 @@ labels.menu_related_content=Verwandte Inhalte labels.menu_related_query=Verwandte Abfragen labels.sidebar.placeholder_search=Suche... labels.sidebar.menu=MENÜ -labels.footer.copyright=©2023 CodeLibs-Projekt. +labels.footer.copyright=©2024 CodeLibs-Projekt. labels.search=Suche labels.similar_doc_result_status=Ähnliche Suchergebnisse werden angezeigt. labels.search_result_status=Suchergebnisse {2} - {3} von {1} für {0} diff --git a/src/main/resources/fess_label_en.properties b/src/main/resources/fess_label_en.properties index e8fa044f53..3af81a210b 100644 --- a/src/main/resources/fess_label_en.properties +++ b/src/main/resources/fess_label_en.properties @@ -197,7 +197,7 @@ labels.menu_plugin=Plugin labels.menu_storage=Storage labels.sidebar.placeholder_search=Search... labels.sidebar.menu=MENU -labels.footer.copyright=©2023 CodeLibs Project. +labels.footer.copyright=©2024 CodeLibs Project. labels.search=Search labels.similar_doc_result_status=Similar results are displayed. labels.search_result_status=Results {2} - {3} of {1} for {0} diff --git a/src/main/resources/fess_label_fr.properties b/src/main/resources/fess_label_fr.properties index b61aea6c86..d23bca440f 100644 --- a/src/main/resources/fess_label_fr.properties +++ b/src/main/resources/fess_label_fr.properties @@ -197,7 +197,7 @@ labels.menu_plugin = Plugin labels.menu_storage = Stockage labels.sidebar.placeholder_search = Recherche... labels.sidebar.menu = MENU -labels.footer.copyright=©2023 Projet CodeLibs. +labels.footer.copyright=©2024 Projet CodeLibs. labels.search = Recherche labels.similar_doc_result_status = Des résultats similaires sont affichés. labels.search_result_status = Résultats {2} - {3} sur {1} pour {0} diff --git a/src/main/resources/fess_label_ja.properties b/src/main/resources/fess_label_ja.properties index 24e95cb0bd..ccd55e2483 100644 --- a/src/main/resources/fess_label_ja.properties +++ b/src/main/resources/fess_label_ja.properties @@ -189,7 +189,7 @@ labels.sidebar.placeholder_search=検索... labels.menu_plugin=プラグイン labels.menu_storage=ストレージ labels.sidebar.menu=メニュー -labels.footer.copyright=©2023 CodeLibs Project. +labels.footer.copyright=©2024 CodeLibs Project. labels.search=検索 labels.similar_doc_result_status=類似している結果を表示しています。 labels.search_result_status={0} の検索結果 {1} 件中 {2} - {3} 件目 diff --git a/src/main/resources/fess_label_ko.properties b/src/main/resources/fess_label_ko.properties index 49676dd932..b8349bacd3 100644 --- a/src/main/resources/fess_label_ko.properties +++ b/src/main/resources/fess_label_ko.properties @@ -176,7 +176,7 @@ labels.menu_backup = 백업 labels.menu_access_token = 액세스 토큰 labels.sidebar.placeholder_search = 검색 ... labels.sidebar.menu = 메뉴 -labels.footer.copyright = © 2023 CodeLibs Project . +labels.footer.copyright = © 2024 CodeLibs Project . labels.search = 검색 labels.search_result_status = {0}결과 {1}건 중 {2}-{3}건 표시 labels.search_result_time = ({0} 초) diff --git a/src/main/resources/fess_label_ru.properties b/src/main/resources/fess_label_ru.properties index 943a06dacb..397e0cc6ac 100644 --- a/src/main/resources/fess_label_ru.properties +++ b/src/main/resources/fess_label_ru.properties @@ -180,7 +180,7 @@ labels.menu_search_list=Поиск labels.menu_backup=Вернуться labels.sidebar.placeholder_search=Поиск... labels.sidebar.menu=MENU -labels.footer.copyright=©2023 CodeLibs Project. +labels.footer.copyright=©2024 CodeLibs Project. labels.search=Поиск labels.search_result_status=Results {2} - {3} of {1} for {0} labels.search_result_time=({0} sec) From 95277d5861687131bdcddfd1dae168f49050ad72 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 11 Apr 2024 11:34:53 +0900 Subject: [PATCH 29/69] fix #2810 Removed sessionId from crawl job configuration scripts --- .../org/codelibs/fess/mylasta/direction/FessConfig.java | 6 +++--- src/main/resources/fess_config.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 bf692b67dd..173b38aea6 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java @@ -187,7 +187,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** The key of the configuration. e.g. Data Crawler - {0} */ String JOB_TEMPLATE_TITLE_DATA = "job.template.title.data"; - /** The key of the configuration. e.g. return container.getComponent("crawlJob").logLevel("info").sessionId("{3}").webConfigIds([{0}] as String[]).fileConfigIds([{1}] as String[]).dataConfigIds([{2}] as String[]).jobExecutor(executor).execute(); */ + /** The key of the configuration. e.g. return container.getComponent("crawlJob").logLevel("info").webConfigIds([{0}] as String[]).fileConfigIds([{1}] as String[]).dataConfigIds([{2}] as String[]).jobExecutor(executor).execute(); */ String JOB_TEMPLATE_SCRIPT = "job.template.script"; /** The key of the configuration. e.g. 0 */ @@ -2134,7 +2134,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** * Get the value for the key 'job.template.script'.
- * The value is, e.g. return container.getComponent("crawlJob").logLevel("info").sessionId("{3}").webConfigIds([{0}] as String[]).fileConfigIds([{1}] as String[]).dataConfigIds([{2}] as String[]).jobExecutor(executor).execute();
+ * The value is, e.g. return container.getComponent("crawlJob").logLevel("info").webConfigIds([{0}] as String[]).fileConfigIds([{1}] as String[]).dataConfigIds([{2}] as String[]).jobExecutor(executor).execute();
* @return The value of found property. (NotNull: if not found, exception but basically no way) */ String getJobTemplateScript(); @@ -10828,7 +10828,7 @@ protected java.util.Map prepareGeneratedDefaultMap() { 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();"); + "return container.getComponent(\"crawlJob\").logLevel(\"info\").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.JOB_DEFAULT_SCRIPT, "groovy"); defaultMap.put(FessConfig.PROCESSORS, "0"); diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties index becd3c521e..6abdd86479 100644 --- a/src/main/resources/fess_config.properties +++ b/src/main/resources/fess_config.properties @@ -149,7 +149,7 @@ job.system.job.ids=default_crawler job.template.title.web=Web Crawler - {0} job.template.title.file=File Crawler - {0} job.template.title.data=Data Crawler - {0} -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(); +job.template.script=return container.getComponent("crawlJob").logLevel("info").webConfigIds([{0}] as String[]).fileConfigIds([{1}] as String[]).dataConfigIds([{2}] as String[]).jobExecutor(executor).execute(); job.max.crawler.processes=0 job.default.script=groovy From 054c7a0b81d7a34d9e33df67fae1f03b90ca7ec8 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 9 May 2024 15:28:46 +0900 Subject: [PATCH 30/69] fix #2812 Refactor content type setting in API response headers for enhanced accuracy and coverage --- .../api/engine/SearchEngineApiManager.java | 48 ++++++++++++++----- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/codelibs/fess/api/engine/SearchEngineApiManager.java b/src/main/java/org/codelibs/fess/api/engine/SearchEngineApiManager.java index 5674832da5..4673ea3d0c 100644 --- a/src/main/java/org/codelibs/fess/api/engine/SearchEngineApiManager.java +++ b/src/main/java/org/codelibs/fess/api/engine/SearchEngineApiManager.java @@ -108,17 +108,6 @@ public void process(final HttpServletRequest request, final HttpServletResponse } protected void processRequest(final HttpServletRequest request, final HttpServletResponse response, final String path) { - if (StringUtil.isNotBlank(path)) { - final String lowerPath = path.toLowerCase(Locale.ROOT); - if (lowerPath.endsWith(".html")) { - response.setContentType("text/html;charset=utf-8"); - } else if (lowerPath.endsWith(".txt")) { - response.setContentType("text/plain"); - } else if (lowerPath.endsWith(".css")) { - response.setContentType("text/css"); - } - } - if ("/_plugin".equals(path) || path.startsWith("/_plugin/")) { processPluginRequest(request, response, path.replaceFirst("^/_plugin", StringUtil.EMPTY)); return; @@ -153,6 +142,12 @@ protected void processRequest(final HttpServletRequest request, final HttpServle try (ServletOutputStream out = response.getOutputStream(); InputStream in = curlResponse.getContentAsStream()) { response.setStatus(curlResponse.getHttpStatusCode()); writeHeaders(response); + final String responseContentType = curlResponse.getHeaderValue("Content-Type"); + if (StringUtil.isBlank(responseContentType)) { + response.setHeader("Content-Type", "application/json"); + } else { + response.setHeader("Content-Type", responseContentType); + } CopyUtil.copy(in, out); } catch (final ClientAbortException e) { logger.debug("Client aborts this request.", e); @@ -166,6 +161,37 @@ protected void processRequest(final HttpServletRequest request, final HttpServle } protected void processPluginRequest(final HttpServletRequest request, final HttpServletResponse response, final String path) { + if (StringUtil.isNotBlank(path)) { + final String lowerPath = path.toLowerCase(Locale.ROOT); + if (lowerPath.endsWith(".html")) { + response.setContentType("text/html;charset=utf-8"); + } else if (lowerPath.endsWith(".css")) { + response.setContentType("text/css"); + } else if (lowerPath.endsWith(".eot")) { + response.setContentType("application/vnd.ms-fontobject"); + } else if (lowerPath.endsWith(".ico")) { + response.setContentType("image/vnd.microsoft.icon"); + } else if (lowerPath.endsWith(".js")) { + response.setContentType("text/javascript"); + } else if (lowerPath.endsWith(".json")) { + response.setContentType("application/json"); + } else if (lowerPath.endsWith(".otf")) { + response.setContentType("font/otf"); + } else if (lowerPath.endsWith(".svg")) { + response.setContentType("image/svg+xml"); + } else if (lowerPath.endsWith(".ttf")) { + response.setContentType("font/ttf"); + } else if (lowerPath.endsWith(".txt")) { + response.setContentType("text/plain"); + } else if (lowerPath.endsWith(".woff")) { + response.setContentType("font/woff"); + } else if (lowerPath.endsWith(".woff2")) { + response.setContentType("font/woff2"); + } else if (lowerPath.endsWith("/")) { + response.setContentType("text/html;charset=utf-8"); + } + } + Path filePath = ResourceUtil.getSitePath(path.replaceAll("\\.\\.+", StringUtil.EMPTY).replaceAll("/+", "/").split("/")); if (Files.isDirectory(filePath)) { filePath = filePath.resolve("index.html"); From 128bd4f3a9403cf1371f9f04bec75afc8e44ddee Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 9 May 2024 15:31:27 +0900 Subject: [PATCH 31/69] fix #2813 Fix typo in operationId from listLPopularWords to listPopularWords --- src/main/config/openapi/openapi-user.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/config/openapi/openapi-user.yaml b/src/main/config/openapi/openapi-user.yaml index df52366edf..fd3b77ea5f 100644 --- a/src/main/config/openapi/openapi-user.yaml +++ b/src/main/config/openapi/openapi-user.yaml @@ -488,7 +488,7 @@ paths: - popularword summary: List popular words description: Returns available labels - operationId: listLPopularWords + operationId: listPopularWords parameters: - name: seed in: query From f3e1e563dc7b586fbc2246de8bb6ad3e6e1a565b Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 9 May 2024 18:48:04 +0900 Subject: [PATCH 32/69] fix #2814 Refactor authentication property key to AUTHENTICATIONS_PROPERTY in DataConfig and WebConfig --- .../org/codelibs/fess/es/config/exentity/DataConfig.java | 3 +-- .../java/org/codelibs/fess/es/config/exentity/WebConfig.java | 2 +- .../org/codelibs/fess/es/config/exentity/WebConfigTest.java | 5 +++-- 3 files changed, 5 insertions(+), 5 deletions(-) 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 6b439480a5..548a61bbe4 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 @@ -174,8 +174,7 @@ public CrawlerClientFactory initializeClientFactory(final Supplier requestHeaderList = requestHeaderService.getRequestHeaderList(getId()); diff --git a/src/test/java/org/codelibs/fess/es/config/exentity/WebConfigTest.java b/src/test/java/org/codelibs/fess/es/config/exentity/WebConfigTest.java index b8273e73e3..b8757a289d 100644 --- a/src/test/java/org/codelibs/fess/es/config/exentity/WebConfigTest.java +++ b/src/test/java/org/codelibs/fess/es/config/exentity/WebConfigTest.java @@ -26,6 +26,7 @@ import org.codelibs.fess.app.service.WebAuthenticationService; import org.codelibs.fess.crawler.client.CrawlerClientFactory; import org.codelibs.fess.crawler.client.http.Authentication; +import org.codelibs.fess.crawler.client.http.HcHttpClient; import org.codelibs.fess.helper.SystemHelper; import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.mylasta.direction.FessProp; @@ -100,7 +101,7 @@ public void setInitParameterMap(final Map params) { assertNotNull(initParamMap); assertEquals(0, ((org.codelibs.fess.crawler.client.http.RequestHeader[]) initParamMap.get("requestHeaders")).length); assertEquals("Mozilla/5.0 (compatible; Fess/98.76; +http://fess.codelibs.org/bot.html)", initParamMap.get("userAgent")); - assertEquals(0, ((Authentication[]) initParamMap.get("basicAuthentications")).length); + assertEquals(0, ((Authentication[]) initParamMap.get(HcHttpClient.AUTHENTICATIONS_PROPERTY)).length); assertTrue(Boolean.valueOf(initParamMap.get("robotsTxtEnabled").toString()).booleanValue()); } @@ -173,7 +174,7 @@ public void setInitParameterMap(final Map params) { assertNotNull(initParamMap); assertEquals(0, ((org.codelibs.fess.crawler.client.http.RequestHeader[]) initParamMap.get("requestHeaders")).length); assertEquals(userAgent, initParamMap.get("userAgent")); - assertEquals(0, ((Authentication[]) initParamMap.get("basicAuthentications")).length); + assertEquals(0, ((Authentication[]) initParamMap.get(HcHttpClient.AUTHENTICATIONS_PROPERTY)).length); assertFalse(Boolean.valueOf(initParamMap.get("robotsTxtEnabled").toString()).booleanValue()); } } From 146f52e2996d8d5b225df725433dda1909ca8ff0 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 30 May 2024 15:58:45 +0900 Subject: [PATCH 33/69] fix #2817 Update site_path abbreviation logic based on configuration settings. --- src/main/java/org/codelibs/fess/helper/ViewHelper.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/codelibs/fess/helper/ViewHelper.java b/src/main/java/org/codelibs/fess/helper/ViewHelper.java index c0b1d0a1a7..9e0d4d22b1 100644 --- a/src/main/java/org/codelibs/fess/helper/ViewHelper.java +++ b/src/main/java/org/codelibs/fess/helper/ViewHelper.java @@ -636,10 +636,11 @@ public Object getSitePath(final Map docMap) { if (siteValue != null) { final String site = siteValue.toString(); final int size = fessConfig.getResponseMaxSitePathLengthAsInteger(); - if (size > -1) { + if (size > 3) { return StringUtils.abbreviate(site, size); + } else if (size >= 0) { + return site; } - return site; } final Object urlLink = docMap.get(fessConfig.getResponseFieldUrlLink()); if (urlLink != null) { @@ -653,7 +654,7 @@ public Object getSitePath(final Map docMap) { returnUrl = url.replaceFirst("^[a-zA-Z0-9]*:/+", ""); } final int size = fessConfig.getResponseMaxSitePathLengthAsInteger(); - if (size > -1) { + if (size > 3) { return StringUtils.abbreviate(returnUrl, size); } return returnUrl; From 95354c54004e4b8700e9d29afb01412ab0297a40 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Mon, 17 Jun 2024 21:38:38 +0900 Subject: [PATCH 34/69] fix #2818 Enable fess-crawler plugin in Fess plugin system --- .../codelibs/fess/helper/PluginHelper.java | 36 +++++++++++++++++-- .../fess/helper/PluginHelperTest.java | 17 +++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/codelibs/fess/helper/PluginHelper.java b/src/main/java/org/codelibs/fess/helper/PluginHelper.java index f5a9104327..7c7149062c 100644 --- a/src/main/java/org/codelibs/fess/helper/PluginHelper.java +++ b/src/main/java/org/codelibs/fess/helper/PluginHelper.java @@ -120,6 +120,9 @@ protected List processRepository(final ArtifactType artifactType, fina final Matcher matcher = Pattern.compile("href=\"[^\"]*(" + artifactType.getId() + "[a-zA-Z0-9\\-]+)/?\"").matcher(repoContent); while (matcher.find()) { final String name = matcher.group(1); + if (isExcludedName(artifactType, name)) { + continue; + } final String pluginUrl = url + (url.endsWith("/") ? name + "/" : "/" + name + "/"); try { final String pluginMetaContent = getRepositoryContent(pluginUrl + "maven-metadata.xml"); @@ -160,6 +163,26 @@ protected List processRepository(final ArtifactType artifactType, fina return list; } + protected boolean isExcludedName(final ArtifactType artifactType, final String name) { + if (artifactType != ArtifactType.CRAWLER) { + return false; + } + + if ("fess-crawler".equals(name)// + || "fess-crawler-db".equals(name)// + || "fess-crawler-db-h2".equals(name)// + || "fess-crawler-db-mysql".equals(name)// + || "fess-crawler-es".equals(name)// + || "fess-crawler-lasta".equals(name)// + || "fess-crawler-parent".equals(name)// + || "fess-crawler-playwright".equals(name)// + || "fess-crawler-webdriver".equals(name)) { + return true; + } + + return false; + } + protected boolean isTargetPluginVersion(final String version) { return ComponentUtil.getFessConfig().isTargetPluginVersion(version); } @@ -378,8 +401,14 @@ public String toString() { } public enum ArtifactType { - DATA_STORE("fess-ds"), THEME("fess-theme"), INGEST("fess-ingest"), SCRIPT("fess-script"), WEBAPP("fess-webapp"), THUMBNAIL( - "fess-thumbnail"), UNKNOWN("jar"); + DATA_STORE("fess-ds"), // + THEME("fess-theme"), // + INGEST("fess-ingest"), // + SCRIPT("fess-script"), // + WEBAPP("fess-webapp"), // + THUMBNAIL("fess-thumbnail"), // + CRAWLER("fess-crawler"), // + UNKNOWN("jar"); private final String id; @@ -410,6 +439,9 @@ public static ArtifactType getType(final String name) { if (name.startsWith(THUMBNAIL.getId())) { return THUMBNAIL; } + if (name.startsWith(CRAWLER.getId())) { + return CRAWLER; + } return UNKNOWN; } } diff --git a/src/test/java/org/codelibs/fess/helper/PluginHelperTest.java b/src/test/java/org/codelibs/fess/helper/PluginHelperTest.java index 71cfca9c2c..7b1e481374 100644 --- a/src/test/java/org/codelibs/fess/helper/PluginHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/PluginHelperTest.java @@ -55,6 +55,12 @@ protected String getRepositoryContent(String url) { } catch (IOException e) { throw new IORuntimeException(e); } + } else if (url.contains("plugin/repo3")) { + try (InputStream is = ResourceUtil.getResourceAsStream(url)) { + return new String(InputStreamUtil.getBytes(is), Constants.UTF_8); + } catch (IOException e) { + throw new IORuntimeException(e); + } } else if (url.contains("plugin/repo.yaml")) { try (InputStream is = ResourceUtil.getResourceAsStream(url)) { return new String(InputStreamUtil.getBytes(is), Constants.UTF_8); @@ -88,6 +94,17 @@ public void test_processRepository2() { list.get(0).getUrl()); } + public void test_processRepository3() { + List list = pluginHelper.processRepository(ArtifactType.CRAWLER, "plugin/repo3/"); + assertEquals(2, list.size()); + assertEquals("fess-crawler-smbj", list.get(0).getName()); + assertEquals("14.14.0", list.get(0).getVersion()); + assertEquals("plugin/repo3/fess-crawler-smbj/14.14.0/fess-crawler-smbj-14.14.0.jar", list.get(0).getUrl()); + assertEquals("fess-crawler-smbj", list.get(1).getName()); + assertEquals("14.15.0", list.get(1).getVersion()); + assertEquals("plugin/repo3/fess-crawler-smbj/14.15.0/fess-crawler-smbj-14.15.0.jar", list.get(1).getUrl()); + } + public void test_getArtifactFromFileName1() { Artifact artifact = pluginHelper.getArtifactFromFileName(ArtifactType.DATA_STORE, "fess-ds-atlassian-13.2.0.jar"); assertEquals("fess-ds-atlassian", artifact.getName()); From 8b2adce4ebfa1b2dcc9f4a35a89c77152f1ab818 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Mon, 17 Jun 2024 22:30:41 +0900 Subject: [PATCH 35/69] #2818 add test resources --- .../fess-crawler-db-h2/maven-metadata.xml | 25 ++++ .../fess-crawler-db-mysql/maven-metadata.xml | 25 ++++ .../repo3/fess-crawler-db/maven-metadata.xml | 25 ++++ .../repo3/fess-crawler-es/maven-metadata.xml | 141 ++++++++++++++++++ .../fess-crawler-lasta/maven-metadata.xml | 141 ++++++++++++++++++ .../fess-crawler-parent/maven-metadata.xml | 140 +++++++++++++++++ .../maven-metadata.xml | 26 ++++ .../fess-crawler-smbj/maven-metadata.xml | 14 ++ .../fess-crawler-webdriver/maven-metadata.xml | 121 +++++++++++++++ .../repo3/fess-crawler/maven-metadata.xml | 141 ++++++++++++++++++ src/test/resources/plugin/repo3/index.html | 70 +++++++++ 11 files changed, 869 insertions(+) create mode 100644 src/test/resources/plugin/repo3/fess-crawler-db-h2/maven-metadata.xml create mode 100644 src/test/resources/plugin/repo3/fess-crawler-db-mysql/maven-metadata.xml create mode 100644 src/test/resources/plugin/repo3/fess-crawler-db/maven-metadata.xml create mode 100644 src/test/resources/plugin/repo3/fess-crawler-es/maven-metadata.xml create mode 100644 src/test/resources/plugin/repo3/fess-crawler-lasta/maven-metadata.xml create mode 100644 src/test/resources/plugin/repo3/fess-crawler-parent/maven-metadata.xml create mode 100644 src/test/resources/plugin/repo3/fess-crawler-playwright/maven-metadata.xml create mode 100644 src/test/resources/plugin/repo3/fess-crawler-smbj/maven-metadata.xml create mode 100644 src/test/resources/plugin/repo3/fess-crawler-webdriver/maven-metadata.xml create mode 100644 src/test/resources/plugin/repo3/fess-crawler/maven-metadata.xml create mode 100644 src/test/resources/plugin/repo3/index.html diff --git a/src/test/resources/plugin/repo3/fess-crawler-db-h2/maven-metadata.xml b/src/test/resources/plugin/repo3/fess-crawler-db-h2/maven-metadata.xml new file mode 100644 index 0000000000..bf77232102 --- /dev/null +++ b/src/test/resources/plugin/repo3/fess-crawler-db-h2/maven-metadata.xml @@ -0,0 +1,25 @@ + + + org.codelibs.fess + fess-crawler-db-h2 + + 1.0.12 + 1.0.12 + + 1.0.0 + 1.0.1 + 1.0.2 + 1.0.3 + 1.0.4 + 1.0.5 + 1.0.6 + 1.0.7 + 1.0.8 + 1.0.9 + 1.0.10 + 1.0.11 + 1.0.12 + + 20161124002555 + + diff --git a/src/test/resources/plugin/repo3/fess-crawler-db-mysql/maven-metadata.xml b/src/test/resources/plugin/repo3/fess-crawler-db-mysql/maven-metadata.xml new file mode 100644 index 0000000000..41fa506362 --- /dev/null +++ b/src/test/resources/plugin/repo3/fess-crawler-db-mysql/maven-metadata.xml @@ -0,0 +1,25 @@ + + + org.codelibs.fess + fess-crawler-db-mysql + + 1.0.12 + 1.0.12 + + 1.0.0 + 1.0.1 + 1.0.2 + 1.0.3 + 1.0.4 + 1.0.5 + 1.0.6 + 1.0.7 + 1.0.8 + 1.0.9 + 1.0.10 + 1.0.11 + 1.0.12 + + 20161124002556 + + diff --git a/src/test/resources/plugin/repo3/fess-crawler-db/maven-metadata.xml b/src/test/resources/plugin/repo3/fess-crawler-db/maven-metadata.xml new file mode 100644 index 0000000000..d73ed1b43c --- /dev/null +++ b/src/test/resources/plugin/repo3/fess-crawler-db/maven-metadata.xml @@ -0,0 +1,25 @@ + + + org.codelibs.fess + fess-crawler-db + + 1.0.12 + 1.0.12 + + 1.0.0 + 1.0.1 + 1.0.2 + 1.0.3 + 1.0.4 + 1.0.5 + 1.0.6 + 1.0.7 + 1.0.8 + 1.0.9 + 1.0.10 + 1.0.11 + 1.0.12 + + 20161124002555 + + diff --git a/src/test/resources/plugin/repo3/fess-crawler-es/maven-metadata.xml b/src/test/resources/plugin/repo3/fess-crawler-es/maven-metadata.xml new file mode 100644 index 0000000000..8503f606fb --- /dev/null +++ b/src/test/resources/plugin/repo3/fess-crawler-es/maven-metadata.xml @@ -0,0 +1,141 @@ + + + org.codelibs.fess + fess-crawler-es + + 14.14.0 + 14.14.0 + + 1.0.0 + 1.0.1 + 1.0.2 + 1.0.3 + 1.0.4 + 1.0.5 + 1.0.6 + 1.0.7 + 1.0.8 + 1.0.9 + 1.0.10 + 1.0.11 + 1.0.12 + 1.1.0 + 1.1.1 + 1.2.0 + 1.2.1 + 1.3.0 + 1.3.1 + 1.3.2 + 1.4.0 + 1.4.1 + 1.4.2 + 1.4.3 + 1.5.0 + 1.5.1 + 1.5.2 + 1.5.3 + 1.5.4 + 1.5.5 + 1.5.6 + 1.5.7 + 1.5.8 + 2.0.0 + 2.0.1 + 2.0.2 + 2.0.3 + 2.0.4 + 2.1.0 + 2.1.1 + 2.1.2 + 2.1.3 + 2.1.4 + 2.2.0 + 2.2.1 + 2.2.2 + 2.2.3 + 2.3.0 + 2.3.1 + 2.3.2 + 2.3.3 + 2.3.4 + 2.3.5 + 2.3.6 + 2.4.0 + 2.4.1 + 2.4.2 + 2.4.3 + 2.4.4 + 2.4.5 + 2.5.0 + 2.5.1 + 2.5.2 + 2.5.3 + 2.6.0 + 2.6.1 + 2.6.2 + 2.6.3 + 2.7.0 + 2.7.1 + 3.0.0 + 3.0.1 + 3.0.2 + 3.1.0 + 3.2.0 + 3.2.1 + 3.3.0 + 3.3.1 + 3.3.2 + 3.4.0 + 3.4.1 + 3.4.2 + 3.4.3 + 3.4.4 + 3.4.5 + 3.5.0 + 3.5.1 + 3.6.0 + 3.6.1 + 3.6.2 + 3.6.3 + 3.7.0 + 3.7.1 + 3.7.2 + 3.8.0 + 3.8.1 + 3.8.2 + 3.9.0 + 3.9.1 + 3.10.0 + 3.10.1 + 3.11.0 + 3.11.1 + 3.11.2 + 3.12.0 + 3.12.1 + 3.13.0 + 3.13.1 + 3.14.0 + 3.15.0 + 3.15.1 + 3.16.0 + 14.0.0 + 14.1.0 + 14.1.1 + 14.2.0 + 14.3.0 + 14.4.0 + 14.5.0 + 14.6.0 + 14.6.1 + 14.7.0 + 14.8.0 + 14.9.0 + 14.10.0 + 14.11.0 + 14.12.0 + 14.13.0 + 14.14.0 + + 20240526050710 + + diff --git a/src/test/resources/plugin/repo3/fess-crawler-lasta/maven-metadata.xml b/src/test/resources/plugin/repo3/fess-crawler-lasta/maven-metadata.xml new file mode 100644 index 0000000000..ad306650cd --- /dev/null +++ b/src/test/resources/plugin/repo3/fess-crawler-lasta/maven-metadata.xml @@ -0,0 +1,141 @@ + + + org.codelibs.fess + fess-crawler-lasta + + 14.14.0 + 14.14.0 + + 1.0.0 + 1.0.1 + 1.0.2 + 1.0.3 + 1.0.4 + 1.0.5 + 1.0.6 + 1.0.7 + 1.0.8 + 1.0.9 + 1.0.10 + 1.0.11 + 1.0.12 + 1.1.0 + 1.1.1 + 1.2.0 + 1.2.1 + 1.3.0 + 1.3.1 + 1.3.2 + 1.4.0 + 1.4.1 + 1.4.2 + 1.4.3 + 1.5.0 + 1.5.1 + 1.5.2 + 1.5.3 + 1.5.4 + 1.5.5 + 1.5.6 + 1.5.7 + 1.5.8 + 2.0.0 + 2.0.1 + 2.0.2 + 2.0.3 + 2.0.4 + 2.1.0 + 2.1.1 + 2.1.2 + 2.1.3 + 2.1.4 + 2.2.0 + 2.2.1 + 2.2.2 + 2.2.3 + 2.3.0 + 2.3.1 + 2.3.2 + 2.3.3 + 2.3.4 + 2.3.5 + 2.3.6 + 2.4.0 + 2.4.1 + 2.4.2 + 2.4.3 + 2.4.4 + 2.4.5 + 2.5.0 + 2.5.1 + 2.5.2 + 2.5.3 + 2.6.0 + 2.6.1 + 2.6.2 + 2.6.3 + 2.7.0 + 2.7.1 + 3.0.0 + 3.0.1 + 3.0.2 + 3.1.0 + 3.2.0 + 3.2.1 + 3.3.0 + 3.3.1 + 3.3.2 + 3.4.0 + 3.4.1 + 3.4.2 + 3.4.3 + 3.4.4 + 3.4.5 + 3.5.0 + 3.5.1 + 3.6.0 + 3.6.1 + 3.6.2 + 3.6.3 + 3.7.0 + 3.7.1 + 3.7.2 + 3.8.0 + 3.8.1 + 3.8.2 + 3.9.0 + 3.9.1 + 3.10.0 + 3.10.1 + 3.11.0 + 3.11.1 + 3.11.2 + 3.12.0 + 3.12.1 + 3.13.0 + 3.13.1 + 3.14.0 + 3.15.0 + 3.15.1 + 3.16.0 + 14.0.0 + 14.1.0 + 14.1.1 + 14.2.0 + 14.3.0 + 14.4.0 + 14.5.0 + 14.6.0 + 14.6.1 + 14.7.0 + 14.8.0 + 14.9.0 + 14.10.0 + 14.11.0 + 14.12.0 + 14.13.0 + 14.14.0 + + 20240526050712 + + diff --git a/src/test/resources/plugin/repo3/fess-crawler-parent/maven-metadata.xml b/src/test/resources/plugin/repo3/fess-crawler-parent/maven-metadata.xml new file mode 100644 index 0000000000..36c4cd7dd7 --- /dev/null +++ b/src/test/resources/plugin/repo3/fess-crawler-parent/maven-metadata.xml @@ -0,0 +1,140 @@ + + + org.codelibs.fess + fess-crawler-parent + + 14.14.0 + 14.14.0 + + 1.0.0 + 1.0.1 + 1.0.2 + 1.0.3 + 1.0.4 + 1.0.5 + 1.0.6 + 1.0.7 + 1.0.8 + 1.0.9 + 1.0.10 + 1.0.11 + 1.0.12 + 1.1.0 + 1.1.1 + 1.2.0 + 1.2.1 + 1.3.0 + 1.3.1 + 1.3.2 + 1.4.0 + 1.4.1 + 1.4.2 + 1.4.3 + 1.5.0 + 1.5.1 + 1.5.2 + 1.5.3 + 1.5.4 + 1.5.5 + 1.5.6 + 1.5.7 + 1.5.8 + 2.0.0 + 2.0.1 + 2.0.2 + 2.0.3 + 2.0.4 + 2.1.0 + 2.1.1 + 2.1.2 + 2.1.3 + 2.1.4 + 2.2.0 + 2.2.1 + 2.2.2 + 2.2.3 + 2.3.0 + 2.3.1 + 2.3.2 + 2.3.3 + 2.3.4 + 2.3.5 + 2.3.6 + 2.4.0 + 2.4.1 + 2.4.2 + 2.4.3 + 2.4.4 + 2.4.5 + 2.5.0 + 2.5.1 + 2.5.2 + 2.5.3 + 2.6.0 + 2.6.2 + 2.6.3 + 2.7.0 + 2.7.1 + 3.0.0 + 3.0.1 + 3.0.2 + 3.1.0 + 3.2.0 + 3.2.1 + 3.3.0 + 3.3.1 + 3.3.2 + 3.4.0 + 3.4.1 + 3.4.2 + 3.4.3 + 3.4.4 + 3.4.5 + 3.5.0 + 3.5.1 + 3.6.0 + 3.6.1 + 3.6.2 + 3.6.3 + 3.7.0 + 3.7.1 + 3.7.2 + 3.8.0 + 3.8.1 + 3.8.2 + 3.9.0 + 3.9.1 + 3.10.0 + 3.10.1 + 3.11.0 + 3.11.1 + 3.11.2 + 3.12.0 + 3.12.1 + 3.13.0 + 3.13.1 + 3.14.0 + 3.15.0 + 3.15.1 + 3.16.0 + 14.0.0 + 14.1.0 + 14.1.1 + 14.2.0 + 14.3.0 + 14.4.0 + 14.5.0 + 14.6.0 + 14.6.1 + 14.7.0 + 14.8.0 + 14.9.0 + 14.10.0 + 14.11.0 + 14.12.0 + 14.13.0 + 14.14.0 + + 20240526050714 + + diff --git a/src/test/resources/plugin/repo3/fess-crawler-playwright/maven-metadata.xml b/src/test/resources/plugin/repo3/fess-crawler-playwright/maven-metadata.xml new file mode 100644 index 0000000000..bf087ff622 --- /dev/null +++ b/src/test/resources/plugin/repo3/fess-crawler-playwright/maven-metadata.xml @@ -0,0 +1,26 @@ + + + org.codelibs.fess + fess-crawler-playwright + + 14.14.0 + 14.14.0 + + 14.5.0 + 14.6.0 + 14.6.1 + 14.6.2 + 14.6.3 + 14.7.0 + 14.8.0 + 14.8.1 + 14.9.0 + 14.10.0 + 14.11.0 + 14.12.0 + 14.13.0 + 14.14.0 + + 20240526053206 + + diff --git a/src/test/resources/plugin/repo3/fess-crawler-smbj/maven-metadata.xml b/src/test/resources/plugin/repo3/fess-crawler-smbj/maven-metadata.xml new file mode 100644 index 0000000000..37c21cc367 --- /dev/null +++ b/src/test/resources/plugin/repo3/fess-crawler-smbj/maven-metadata.xml @@ -0,0 +1,14 @@ + + + org.codelibs.fess + fess-crawler-smbj + + 14.15.0 + 14.15.0 + + 14.14.0 + 14.15.0 + + 20240526053206 + + diff --git a/src/test/resources/plugin/repo3/fess-crawler-webdriver/maven-metadata.xml b/src/test/resources/plugin/repo3/fess-crawler-webdriver/maven-metadata.xml new file mode 100644 index 0000000000..ea6a18e0f3 --- /dev/null +++ b/src/test/resources/plugin/repo3/fess-crawler-webdriver/maven-metadata.xml @@ -0,0 +1,121 @@ + + + org.codelibs.fess + fess-crawler-webdriver + + 3.16.0 + 3.16.0 + + 1.0.3 + 1.0.4 + 1.0.5 + 1.0.6 + 1.0.7 + 1.0.8 + 1.0.9 + 1.0.10 + 1.0.11 + 1.0.12 + 1.1.0 + 1.1.1 + 1.2.0 + 1.2.1 + 1.3.0 + 1.3.1 + 1.3.2 + 1.4.0 + 1.4.1 + 1.4.2 + 1.4.3 + 1.5.0 + 1.5.1 + 1.5.2 + 1.5.3 + 1.5.4 + 1.5.5 + 1.5.6 + 1.5.7 + 1.5.8 + 2.0.0 + 2.0.1 + 2.0.2 + 2.0.3 + 2.0.4 + 2.1.0 + 2.1.1 + 2.1.2 + 2.1.3 + 2.1.4 + 2.2.0 + 2.2.1 + 2.2.2 + 2.2.3 + 2.3.0 + 2.3.1 + 2.3.2 + 2.3.3 + 2.3.4 + 2.3.5 + 2.3.6 + 2.4.0 + 2.4.1 + 2.4.2 + 2.4.3 + 2.4.4 + 2.4.5 + 2.5.0 + 2.5.1 + 2.5.2 + 2.5.3 + 2.6.0 + 2.6.1 + 2.6.2 + 2.6.3 + 2.7.0 + 2.7.1 + 3.0.0 + 3.0.1 + 3.0.2 + 3.1.0 + 3.2.0 + 3.2.1 + 3.3.0 + 3.3.1 + 3.3.2 + 3.4.0 + 3.4.1 + 3.4.2 + 3.4.3 + 3.4.4 + 3.4.5 + 3.5.0 + 3.5.1 + 3.6.0 + 3.6.1 + 3.6.2 + 3.6.3 + 3.7.0 + 3.7.1 + 3.7.2 + 3.8.0 + 3.8.1 + 3.8.2 + 3.9.0 + 3.9.1 + 3.10.0 + 3.10.1 + 3.11.0 + 3.11.1 + 3.11.2 + 3.12.0 + 3.12.1 + 3.13.0 + 3.13.1 + 3.14.0 + 3.15.0 + 3.15.1 + 3.16.0 + + 20211220082253 + + diff --git a/src/test/resources/plugin/repo3/fess-crawler/maven-metadata.xml b/src/test/resources/plugin/repo3/fess-crawler/maven-metadata.xml new file mode 100644 index 0000000000..fe0eb37c4b --- /dev/null +++ b/src/test/resources/plugin/repo3/fess-crawler/maven-metadata.xml @@ -0,0 +1,141 @@ + + + org.codelibs.fess + fess-crawler + + 14.14.0 + 14.14.0 + + 1.0.0 + 1.0.1 + 1.0.2 + 1.0.3 + 1.0.4 + 1.0.5 + 1.0.6 + 1.0.7 + 1.0.8 + 1.0.9 + 1.0.10 + 1.0.11 + 1.0.12 + 1.1.0 + 1.1.1 + 1.2.0 + 1.2.1 + 1.3.0 + 1.3.1 + 1.3.2 + 1.4.0 + 1.4.1 + 1.4.2 + 1.4.3 + 1.5.0 + 1.5.1 + 1.5.2 + 1.5.3 + 1.5.4 + 1.5.5 + 1.5.6 + 1.5.7 + 1.5.8 + 2.0.0 + 2.0.1 + 2.0.2 + 2.0.3 + 2.0.4 + 2.1.0 + 2.1.1 + 2.1.2 + 2.1.3 + 2.1.4 + 2.2.0 + 2.2.1 + 2.2.2 + 2.2.3 + 2.3.0 + 2.3.1 + 2.3.2 + 2.3.3 + 2.3.4 + 2.3.5 + 2.3.6 + 2.4.0 + 2.4.1 + 2.4.2 + 2.4.3 + 2.4.4 + 2.4.5 + 2.5.0 + 2.5.1 + 2.5.2 + 2.5.3 + 2.6.0 + 2.6.1 + 2.6.2 + 2.6.3 + 2.7.0 + 2.7.1 + 3.0.0 + 3.0.1 + 3.0.2 + 3.1.0 + 3.2.0 + 3.2.1 + 3.3.0 + 3.3.1 + 3.3.2 + 3.4.0 + 3.4.1 + 3.4.2 + 3.4.3 + 3.4.4 + 3.4.5 + 3.5.0 + 3.5.1 + 3.6.0 + 3.6.1 + 3.6.2 + 3.6.3 + 3.7.0 + 3.7.1 + 3.7.2 + 3.8.0 + 3.8.1 + 3.8.2 + 3.9.0 + 3.9.1 + 3.10.0 + 3.10.1 + 3.11.0 + 3.11.1 + 3.11.2 + 3.12.0 + 3.12.1 + 3.13.0 + 3.13.1 + 3.14.0 + 3.15.0 + 3.15.1 + 3.16.0 + 14.0.0 + 14.1.0 + 14.1.1 + 14.2.0 + 14.3.0 + 14.4.0 + 14.5.0 + 14.6.0 + 14.6.1 + 14.7.0 + 14.8.0 + 14.9.0 + 14.10.0 + 14.11.0 + 14.12.0 + 14.13.0 + 14.14.0 + + 20240526050708 + + diff --git a/src/test/resources/plugin/repo3/index.html b/src/test/resources/plugin/repo3/index.html new file mode 100644 index 0000000000..baae51ddc9 --- /dev/null +++ b/src/test/resources/plugin/repo3/index.html @@ -0,0 +1,70 @@ + + + + + + Central Repository: org/codelibs/fess + + + + + +
+

org/codelibs/fess

+
+
+
+ 
+../
+fess/                                                            -         -      
+fess-crawler/                                                    -         -      
+fess-crawler-db/                                                 -         -      
+fess-crawler-db-h2/                                              -         -      
+fess-crawler-db-mysql/                                           -         -      
+fess-crawler-es/                                                 -         -      
+fess-crawler-lasta/                                              -         -      
+fess-crawler-parent/                                             -         -      
+fess-crawler-playwright/                                         -         -      
+fess-crawler-smbj/                                         -         -      
+fess-crawler-webdriver/                                          -         -      
+fess-ds-atlassian/                                               -         -      
+fess-ds-box/                                                     -         -      
+fess-ds-csv/                                                     -         -      
+fess-ds-db/                                                      -         -      
+fess-ds-dropbox/                                                 -         -      
+fess-ds-elasticsearch/                                           -         -      
+fess-ds-git/                                                     -         -      
+fess-ds-gitbucket/                                               -         -      
+fess-ds-gsuite/                                                  -         -      
+fess-ds-json/                                                    -         -      
+fess-ds-office365/                                               -         -      
+fess-ds-s3/                                                      -         -      
+fess-ds-salesforce/                                              -         -      
+fess-ds-sharepoint/                                              -         -      
+fess-ds-slack/                                                   -         -      
+fess-ds-wikipedia/                                               -         -      
+fess-ingest-logger/                                              -         -      
+fess-ingest-ndjson/                                              -         -      
+fess-parent/                                                     -         -      
+fess-script-groovy/                                              -         -      
+fess-script-ognl/                                                -         -      
+fess-suggest/                                                    -         -      
+fess-theme-classic/                                              -         -      
+fess-theme-codesearch/                                           -         -      
+fess-theme-simple/                                               -         -      
+fess-thumbnail-playwright/                                       -         -      
+fess-webapp-chatgpt/                                             -         -      
+fess-webapp-classic-api/                                         -         -      
+fess-webapp-gsa-api/                                             -         -      
+fess-webapp-semantic-search/                                     -         -      
+fess-xpack/                                                      -         -      
+
+
+
+ + + From 10c84ab75f13e5212f270d5bb1b523baed465cef Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Mon, 17 Jun 2024 22:35:51 +0900 Subject: [PATCH 36/69] fix #2819 add ProtocolHelper for URL protocol management and update related classes --- .../codelibs/fess/helper/ProtocolHelper.java | 86 +++++++++++++++ .../fess/helper/WebFsIndexHelper.java | 5 +- .../fess/mylasta/direction/FessProp.java | 4 + .../org/codelibs/fess/util/ComponentUtil.java | 7 ++ .../fess/validation/UriTypeValidator.java | 4 +- src/main/resources/fess.xml | 4 +- .../fess/helper/ProtocolHelperTest.java | 102 ++++++++++++++++++ 7 files changed, 207 insertions(+), 5 deletions(-) create mode 100644 src/main/java/org/codelibs/fess/helper/ProtocolHelper.java create mode 100644 src/test/java/org/codelibs/fess/helper/ProtocolHelperTest.java diff --git a/src/main/java/org/codelibs/fess/helper/ProtocolHelper.java b/src/main/java/org/codelibs/fess/helper/ProtocolHelper.java new file mode 100644 index 0000000000..ae86271c07 --- /dev/null +++ b/src/main/java/org/codelibs/fess/helper/ProtocolHelper.java @@ -0,0 +1,86 @@ +/* + * Copyright 2012-2024 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.helper; + +import static org.codelibs.core.stream.StreamUtil.split; +import static org.codelibs.core.stream.StreamUtil.stream; + +import java.util.Arrays; + +import javax.annotation.PostConstruct; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.codelibs.core.lang.StringUtil; +import org.codelibs.fess.mylasta.direction.FessConfig; +import org.codelibs.fess.util.ComponentUtil; + +public class ProtocolHelper { + private static final Logger logger = LogManager.getLogger(ProtocolHelper.class); + + protected String[] webProtocols = StringUtil.EMPTY_STRINGS; + + protected String[] fileProtocols = StringUtil.EMPTY_STRINGS; + + @PostConstruct + public void init() { + final FessConfig fessConfig = ComponentUtil.getFessConfig(); + webProtocols = split(fessConfig.getCrawlerWebProtocols(), ",") + .get(stream -> stream.filter(StringUtil::isNotBlank).map(s -> s.trim() + ":").toArray(n -> new String[n])); + fileProtocols = split(fessConfig.getCrawlerFileProtocols(), ",") + .get(stream -> stream.filter(StringUtil::isNotBlank).map(s -> s.trim() + ":").toArray(n -> new String[n])); + if (logger.isDebugEnabled()) { + logger.debug("web protocols: {}", Arrays.toString(webProtocols)); + logger.debug("file protocols: {}", Arrays.toString(fileProtocols)); + } + } + + public String[] getWebProtocols() { + return webProtocols; + } + + public String[] getFileProtocols() { + return fileProtocols; + } + + public boolean isValidWebProtocol(final String url) { + return stream(webProtocols).get(stream -> stream.anyMatch(s -> url.startsWith(s))); + } + + public boolean isValidFileProtocol(final String url) { + return stream(fileProtocols).get(stream -> stream.anyMatch(s -> url.startsWith(s))); + } + + public void addWebProtocol(final String protocol) { + final String prefix = protocol + ":"; + if (stream(webProtocols).get(stream -> stream.anyMatch(s -> s.equals(prefix)))) { + logger.debug("web protocols contains {}.", protocol); + return; + } + webProtocols = Arrays.copyOf(webProtocols, webProtocols.length + 1); + webProtocols[webProtocols.length - 1] = prefix; + } + + public void addFileProtocol(final String protocol) { + final String prefix = protocol + ":"; + if (stream(fileProtocols).get(stream -> stream.anyMatch(s -> s.equals(prefix)))) { + logger.debug("file protocols contains {}.", protocol); + return; + } + fileProtocols = Arrays.copyOf(fileProtocols, fileProtocols.length + 1); + fileProtocols[fileProtocols.length - 1] = prefix; + } +} diff --git a/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java b/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java index 8e264aaea1..e9849e57ca 100644 --- a/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java +++ b/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java @@ -93,6 +93,7 @@ protected void doCrawl(final String sessionId, final List webConfigLi final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); final FessConfig fessConfig = ComponentUtil.getFessConfig(); + final ProtocolHelper protocolHelper = ComponentUtil.getProtocolHelper(); final long startTime = systemHelper.getCurrentTimeAsLong(); @@ -154,7 +155,7 @@ protected void doCrawl(final String sessionId, final List webConfigLi // set urls split(urlsStr, "[\r\n]").of(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).distinct().forEach(urlValue -> { - if (!urlValue.startsWith("#") && fessConfig.isValidCrawlerWebProtocol(urlValue)) { + if (!urlValue.startsWith("#") && protocolHelper.isValidWebProtocol(urlValue)) { final String u = duplicateHostHelper.convert(urlValue); crawler.addUrl(u); if (logger.isInfoEnabled()) { @@ -280,7 +281,7 @@ protected void doCrawl(final String sessionId, final List webConfigLi split(pathsStr, "[\r\n]").of(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).distinct().forEach(urlValue -> { if (!urlValue.startsWith("#")) { final String u; - if (!fessConfig.isValidCrawlerFileProtocol(urlValue)) { + if (!protocolHelper.isValidFileProtocol(urlValue)) { if (urlValue.startsWith("/")) { u = "file:" + urlValue; } else { 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 dcfc274d8a..c23ddeedf1 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java @@ -1190,22 +1190,26 @@ default boolean isLdapAdminEnabled(final String username) { String getCrawlerWebProtocols(); + @Deprecated default String[] getCrawlerWebProtocolsAsArray() { return split(getCrawlerWebProtocols(), ",") .get(stream -> stream.filter(StringUtil::isNotBlank).map(s -> s.trim() + ":").toArray(n -> new String[n])); } + @Deprecated default boolean isValidCrawlerWebProtocol(final String url) { return stream(getCrawlerWebProtocolsAsArray()).get(stream -> stream.anyMatch(s -> url.startsWith(s))); } String getCrawlerFileProtocols(); + @Deprecated default String[] getCrawlerFileProtocolsAsArray() { return split(getCrawlerFileProtocols(), ",") .get(stream -> stream.filter(StringUtil::isNotBlank).map(s -> s.trim() + ":").toArray(n -> new String[n])); } + @Deprecated default boolean isValidCrawlerFileProtocol(final String url) { return stream(getCrawlerFileProtocolsAsArray()).get(stream -> stream.anyMatch(s -> url.startsWith(s))); } diff --git a/src/main/java/org/codelibs/fess/util/ComponentUtil.java b/src/main/java/org/codelibs/fess/util/ComponentUtil.java index e2ef4287ae..6a87dcf597 100644 --- a/src/main/java/org/codelibs/fess/util/ComponentUtil.java +++ b/src/main/java/org/codelibs/fess/util/ComponentUtil.java @@ -58,6 +58,7 @@ import org.codelibs.fess.helper.PluginHelper; import org.codelibs.fess.helper.PopularWordHelper; import org.codelibs.fess.helper.ProcessHelper; +import org.codelibs.fess.helper.ProtocolHelper; import org.codelibs.fess.helper.QueryHelper; import org.codelibs.fess.helper.RelatedContentHelper; import org.codelibs.fess.helper.RelatedQueryHelper; @@ -216,6 +217,8 @@ public final class ComponentUtil { private static final String RANK_FUSION_PROCESSOR = "rankFusionProcessor"; + private static final String PROTOCOL_HELPER = "protocolHelper"; + private static IndexingHelper indexingHelper; private static CrawlingConfigHelper crawlingConfigHelper; @@ -521,6 +524,10 @@ public static RankFusionProcessor getRankFusionProcessor() { return getComponent(RANK_FUSION_PROCESSOR); } + public static ProtocolHelper getProtocolHelper() { + return getComponent(PROTOCOL_HELPER); + } + @SuppressWarnings("unchecked") public static T getComponent(final Class clazz) { try { diff --git a/src/main/java/org/codelibs/fess/validation/UriTypeValidator.java b/src/main/java/org/codelibs/fess/validation/UriTypeValidator.java index b5e63f518c..67fb2cf05d 100644 --- a/src/main/java/org/codelibs/fess/validation/UriTypeValidator.java +++ b/src/main/java/org/codelibs/fess/validation/UriTypeValidator.java @@ -28,8 +28,8 @@ public class UriTypeValidator implements ConstraintValidator { @Override public void initialize(final UriType uriType) { protocols = switch (uriType.protocolType()) { - case WEB -> ComponentUtil.getFessConfig().getCrawlerWebProtocolsAsArray(); - case FILE -> ComponentUtil.getFessConfig().getCrawlerFileProtocolsAsArray(); + case WEB -> ComponentUtil.getProtocolHelper().getWebProtocols(); + case FILE -> ComponentUtil.getProtocolHelper().getFileProtocols(); default -> throw new ConstraintDefinitionException("protocolType is emtpy."); }; } diff --git a/src/main/resources/fess.xml b/src/main/resources/fess.xml index 4c1d7753f9..310b2b420f 100644 --- a/src/main/resources/fess.xml +++ b/src/main/resources/fess.xml @@ -36,9 +36,11 @@ + + - + diff --git a/src/test/java/org/codelibs/fess/helper/ProtocolHelperTest.java b/src/test/java/org/codelibs/fess/helper/ProtocolHelperTest.java new file mode 100644 index 0000000000..ba78126907 --- /dev/null +++ b/src/test/java/org/codelibs/fess/helper/ProtocolHelperTest.java @@ -0,0 +1,102 @@ +/* + * Copyright 2012-2024 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.helper; + +import org.codelibs.fess.mylasta.direction.FessConfig; +import org.codelibs.fess.unit.UnitFessTestCase; +import org.codelibs.fess.util.ComponentUtil; + +public class ProtocolHelperTest extends UnitFessTestCase { + public void test_add_httpx() { + ComponentUtil.setFessConfig(new FessConfig.SimpleImpl() { + @Override + public String getCrawlerWebProtocols() { + return "http,https"; + } + + @Override + public String getCrawlerFileProtocols() { + return "file,smb"; + } + }); + + final ProtocolHelper protocolHelper = new ProtocolHelper(); + protocolHelper.init(); + assertEquals(2, protocolHelper.getWebProtocols().length); + assertEquals("http:", protocolHelper.getWebProtocols()[0]); + assertEquals("https:", protocolHelper.getWebProtocols()[1]); + assertEquals(2, protocolHelper.getFileProtocols().length); + assertEquals("file:", protocolHelper.getFileProtocols()[0]); + assertEquals("smb:", protocolHelper.getFileProtocols()[1]); + + assertFalse(protocolHelper.isValidWebProtocol("httpx://test")); + + protocolHelper.addWebProtocol("httpx"); + assertEquals(3, protocolHelper.getWebProtocols().length); + assertEquals("http:", protocolHelper.getWebProtocols()[0]); + assertEquals("https:", protocolHelper.getWebProtocols()[1]); + assertEquals("httpx:", protocolHelper.getWebProtocols()[2]); + assertEquals(2, protocolHelper.getFileProtocols().length); + assertEquals("file:", protocolHelper.getFileProtocols()[0]); + assertEquals("smb:", protocolHelper.getFileProtocols()[1]); + + assertTrue(protocolHelper.isValidWebProtocol("httpx://test")); + + protocolHelper.addWebProtocol("httpx"); + assertEquals(3, protocolHelper.getWebProtocols().length); + assertEquals(2, protocolHelper.getFileProtocols().length); + } + + public void test_add_smbx() { + ComponentUtil.setFessConfig(new FessConfig.SimpleImpl() { + @Override + public String getCrawlerWebProtocols() { + return "http,https"; + } + + @Override + public String getCrawlerFileProtocols() { + return "file,smb"; + } + }); + + final ProtocolHelper protocolHelper = new ProtocolHelper(); + protocolHelper.init(); + assertEquals(2, protocolHelper.getWebProtocols().length); + assertEquals("http:", protocolHelper.getWebProtocols()[0]); + assertEquals("https:", protocolHelper.getWebProtocols()[1]); + assertEquals(2, protocolHelper.getFileProtocols().length); + assertEquals("file:", protocolHelper.getFileProtocols()[0]); + assertEquals("smb:", protocolHelper.getFileProtocols()[1]); + + assertFalse(protocolHelper.isValidFileProtocol("smbx://test")); + + protocolHelper.addFileProtocol("smbx"); + assertEquals(2, protocolHelper.getWebProtocols().length); + assertEquals("http:", protocolHelper.getWebProtocols()[0]); + assertEquals("https:", protocolHelper.getWebProtocols()[1]); + assertEquals(3, protocolHelper.getFileProtocols().length); + assertEquals("file:", protocolHelper.getFileProtocols()[0]); + assertEquals("smb:", protocolHelper.getFileProtocols()[1]); + assertEquals("smbx:", protocolHelper.getFileProtocols()[2]); + + assertTrue(protocolHelper.isValidFileProtocol("smbx://test")); + + protocolHelper.addFileProtocol("smbx"); + assertEquals(2, protocolHelper.getWebProtocols().length); + assertEquals(3, protocolHelper.getFileProtocols().length); + } +} From af31322593994e40e821688816821737a1c2fcfe Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Tue, 18 Jun 2024 08:09:13 +0900 Subject: [PATCH 37/69] #2819 fix imports --- src/main/java/org/codelibs/fess/helper/ProtocolHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/codelibs/fess/helper/ProtocolHelper.java b/src/main/java/org/codelibs/fess/helper/ProtocolHelper.java index ae86271c07..6866f8bb04 100644 --- a/src/main/java/org/codelibs/fess/helper/ProtocolHelper.java +++ b/src/main/java/org/codelibs/fess/helper/ProtocolHelper.java @@ -20,14 +20,14 @@ import java.util.Arrays; -import javax.annotation.PostConstruct; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.util.ComponentUtil; +import jakarta.annotation.PostConstruct; + public class ProtocolHelper { private static final Logger logger = LogManager.getLogger(ProtocolHelper.class); From 3551d13562118d73accfa01f1d929867fca20050 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Tue, 18 Jun 2024 09:44:11 +0900 Subject: [PATCH 38/69] fix #2820 Add dynamic protocol registration based on PROTOCOL_TYPE in Handler class --- .../codelibs/fess/helper/ProtocolHelper.java | 59 +++++++++++++++++++ .../fess/helper/ProtocolHelperTest.java | 8 +++ .../fess/test/net/protocol/xxx1/Handler.java | 32 ++++++++++ .../fess/test/net/protocol/xxx2/Handler.java | 32 ++++++++++ .../fess/test/net/protocol/xxx3/Handler.java | 32 ++++++++++ .../fess/test/net/protocol/xxx4/Handler.java | 30 ++++++++++ .../test/net/protocol/xxx5/TestHandler.java | 20 +++++++ 7 files changed, 213 insertions(+) create mode 100644 src/test/java/org/codelibs/fess/test/net/protocol/xxx1/Handler.java create mode 100644 src/test/java/org/codelibs/fess/test/net/protocol/xxx2/Handler.java create mode 100644 src/test/java/org/codelibs/fess/test/net/protocol/xxx3/Handler.java create mode 100644 src/test/java/org/codelibs/fess/test/net/protocol/xxx4/Handler.java create mode 100644 src/test/java/org/codelibs/fess/test/net/protocol/xxx5/TestHandler.java diff --git a/src/main/java/org/codelibs/fess/helper/ProtocolHelper.java b/src/main/java/org/codelibs/fess/helper/ProtocolHelper.java index 6866f8bb04..39dd0e81b4 100644 --- a/src/main/java/org/codelibs/fess/helper/ProtocolHelper.java +++ b/src/main/java/org/codelibs/fess/helper/ProtocolHelper.java @@ -18,10 +18,20 @@ import static org.codelibs.core.stream.StreamUtil.split; import static org.codelibs.core.stream.StreamUtil.stream; +import java.io.File; +import java.io.IOException; +import java.lang.reflect.Field; +import java.net.URL; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Enumeration; +import java.util.List; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.codelibs.core.exception.ClassNotFoundRuntimeException; +import org.codelibs.core.exception.NoSuchFieldRuntimeException; +import org.codelibs.core.lang.ClassUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.util.ComponentUtil; @@ -42,12 +52,61 @@ public void init() { .get(stream -> stream.filter(StringUtil::isNotBlank).map(s -> s.trim() + ":").toArray(n -> new String[n])); fileProtocols = split(fessConfig.getCrawlerFileProtocols(), ",") .get(stream -> stream.filter(StringUtil::isNotBlank).map(s -> s.trim() + ":").toArray(n -> new String[n])); + + loadProtocols("org.codelibs.fess.net.protocol"); + if (logger.isDebugEnabled()) { logger.debug("web protocols: {}", Arrays.toString(webProtocols)); logger.debug("file protocols: {}", Arrays.toString(fileProtocols)); } } + protected void loadProtocols(final String basePackage) { + final List subPackages = new ArrayList<>(); + final String path = basePackage.replace('.', '/'); + final ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); + try { + final Enumeration resources = classLoader.getResources(path); + + while (resources.hasMoreElements()) { + final URL resource = resources.nextElement(); + final File directory = new File(resource.getFile()); + if (directory.exists() && directory.isDirectory()) { + final File[] files = directory.listFiles(File::isDirectory); + if (files != null) { + for (final File file : files) { + subPackages.add(file.getName()); + } + } + } + } + } catch (final IOException e) { + logger.warn("Cannot load subpackages from {}", basePackage, e); + } + + subPackages.stream().forEach(protocol -> { + try { + final Class handlerClazz = ClassUtil.forName(basePackage + "." + protocol + ".Handler"); + final Field protocolTypeField = ClassUtil.getDeclaredField(handlerClazz, "PROTOCOL_TYPE"); + if (protocolTypeField.get(null) instanceof final String protocolType) { + if ("web".equalsIgnoreCase(protocolType)) { + addWebProtocol(protocol); + } else if ("file".equalsIgnoreCase(protocolType)) { + addFileProtocol(protocol); + } else { + logger.warn("Unknown protocol: {}", protocol); + } + } + } catch (final ClassNotFoundRuntimeException e) { + logger.debug("{}.{}.Handler does not exist.", basePackage, protocol, e); + } catch (final NoSuchFieldRuntimeException e) { + logger.debug("{}.{}.Handler does not contain PROTOCOL_TYPE.", basePackage, protocol, e); + } catch (final Exception e) { + logger.warn("Cannot load Handler from {}.{}", basePackage, protocol, e); + } + }); + } + public String[] getWebProtocols() { return webProtocols; } diff --git a/src/test/java/org/codelibs/fess/helper/ProtocolHelperTest.java b/src/test/java/org/codelibs/fess/helper/ProtocolHelperTest.java index ba78126907..9ed681bd4f 100644 --- a/src/test/java/org/codelibs/fess/helper/ProtocolHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/ProtocolHelperTest.java @@ -99,4 +99,12 @@ public String getCrawlerFileProtocols() { assertEquals(2, protocolHelper.getWebProtocols().length); assertEquals(3, protocolHelper.getFileProtocols().length); } + + public void test_loadProtocols() { + final ProtocolHelper protocolHelper = new ProtocolHelper(); + protocolHelper.loadProtocols("org.codelibs.fess.test.net.protocol"); + + assertEquals(1, protocolHelper.getWebProtocols().length); + assertEquals(1, protocolHelper.getFileProtocols().length); + } } diff --git a/src/test/java/org/codelibs/fess/test/net/protocol/xxx1/Handler.java b/src/test/java/org/codelibs/fess/test/net/protocol/xxx1/Handler.java new file mode 100644 index 0000000000..0e9b384483 --- /dev/null +++ b/src/test/java/org/codelibs/fess/test/net/protocol/xxx1/Handler.java @@ -0,0 +1,32 @@ +/* + * Copyright 2012-2024 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.test.net.protocol.xxx1; + +import java.io.IOException; +import java.net.URL; +import java.net.URLConnection; +import java.net.URLStreamHandler; + +public class Handler extends URLStreamHandler { + + public static final String PROTOCOL_TYPE = "web"; + + @Override + protected URLConnection openConnection(URL u) throws IOException { + return null; + } + +} diff --git a/src/test/java/org/codelibs/fess/test/net/protocol/xxx2/Handler.java b/src/test/java/org/codelibs/fess/test/net/protocol/xxx2/Handler.java new file mode 100644 index 0000000000..415fabd9b7 --- /dev/null +++ b/src/test/java/org/codelibs/fess/test/net/protocol/xxx2/Handler.java @@ -0,0 +1,32 @@ +/* + * Copyright 2012-2024 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.test.net.protocol.xxx2; + +import java.io.IOException; +import java.net.URL; +import java.net.URLConnection; +import java.net.URLStreamHandler; + +public class Handler extends URLStreamHandler { + + public static final String PROTOCOL_TYPE = "file"; + + @Override + protected URLConnection openConnection(URL u) throws IOException { + return null; + } + +} diff --git a/src/test/java/org/codelibs/fess/test/net/protocol/xxx3/Handler.java b/src/test/java/org/codelibs/fess/test/net/protocol/xxx3/Handler.java new file mode 100644 index 0000000000..676e6264da --- /dev/null +++ b/src/test/java/org/codelibs/fess/test/net/protocol/xxx3/Handler.java @@ -0,0 +1,32 @@ +/* + * Copyright 2012-2024 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.test.net.protocol.xxx3; + +import java.io.IOException; +import java.net.URL; +import java.net.URLConnection; +import java.net.URLStreamHandler; + +public class Handler extends URLStreamHandler { + + public static final String PROTOCOL_TYPE = "test"; + + @Override + protected URLConnection openConnection(URL u) throws IOException { + return null; + } + +} diff --git a/src/test/java/org/codelibs/fess/test/net/protocol/xxx4/Handler.java b/src/test/java/org/codelibs/fess/test/net/protocol/xxx4/Handler.java new file mode 100644 index 0000000000..8ea8f5fd05 --- /dev/null +++ b/src/test/java/org/codelibs/fess/test/net/protocol/xxx4/Handler.java @@ -0,0 +1,30 @@ +/* + * Copyright 2012-2024 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.test.net.protocol.xxx4; + +import java.io.IOException; +import java.net.URL; +import java.net.URLConnection; +import java.net.URLStreamHandler; + +public class Handler extends URLStreamHandler { + + @Override + protected URLConnection openConnection(URL u) throws IOException { + return null; + } + +} diff --git a/src/test/java/org/codelibs/fess/test/net/protocol/xxx5/TestHandler.java b/src/test/java/org/codelibs/fess/test/net/protocol/xxx5/TestHandler.java new file mode 100644 index 0000000000..b30ad5ad1f --- /dev/null +++ b/src/test/java/org/codelibs/fess/test/net/protocol/xxx5/TestHandler.java @@ -0,0 +1,20 @@ +/* + * Copyright 2012-2024 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.test.net.protocol.xxx5; + +public class TestHandler { + +} From 4afbb344c7a349658c3226c88cdaaf40ee580832 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Wed, 19 Jun 2024 10:33:54 +0900 Subject: [PATCH 39/69] #2820 Fix package name retrieval from Jar files --- .../codelibs/fess/helper/ProtocolHelper.java | 36 +++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/codelibs/fess/helper/ProtocolHelper.java b/src/main/java/org/codelibs/fess/helper/ProtocolHelper.java index 39dd0e81b4..96d1c12208 100644 --- a/src/main/java/org/codelibs/fess/helper/ProtocolHelper.java +++ b/src/main/java/org/codelibs/fess/helper/ProtocolHelper.java @@ -21,11 +21,14 @@ import java.io.File; import java.io.IOException; import java.lang.reflect.Field; +import java.net.JarURLConnection; import java.net.URL; import java.util.ArrayList; import java.util.Arrays; import java.util.Enumeration; import java.util.List; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -70,12 +73,33 @@ protected void loadProtocols(final String basePackage) { while (resources.hasMoreElements()) { final URL resource = resources.nextElement(); - final File directory = new File(resource.getFile()); - if (directory.exists() && directory.isDirectory()) { - final File[] files = directory.listFiles(File::isDirectory); - if (files != null) { - for (final File file : files) { - subPackages.add(file.getName()); + logger.debug("loading {}", resource); + if ("file".equals(resource.getProtocol())) { + final File directory = new File(resource.getFile()); + if (directory.exists() && directory.isDirectory()) { + final File[] files = directory.listFiles(File::isDirectory); + if (files != null) { + for (final File file : files) { + final String name = file.getName(); + subPackages.add(name); + logger.debug("found {} in {}", name, resource); + } + } + } + } else if ("jar".equals(resource.getProtocol())) { + final JarURLConnection jarURLConnection = (JarURLConnection) resource.openConnection(); + try (JarFile jarFile = jarURLConnection.getJarFile()) { + final Enumeration entries = jarFile.entries(); + while (entries.hasMoreElements()) { + final JarEntry entry = entries.nextElement(); + final String entryName = entry.getName(); + if (entryName.endsWith("/") && entryName.startsWith(path) && entryName.length() > path.length() + 1) { + final String name = entryName.substring(path.length() + 1, entryName.length() - 1); + if (name.indexOf('/') == -1) { + subPackages.add(name); + logger.debug("found {} in {}", name, resource); + } + } } } } From ec33a254954045160ac76739fd561c80f4ec3c8c Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 20 Jun 2024 21:01:20 +0900 Subject: [PATCH 40/69] fix #2821 Exclude X-FESS metadata from indexing and add transformation process for metadata inclusion. --- .../transformer/AbstractFessFileTransformer.java | 10 +++++----- .../codelibs/fess/mylasta/direction/FessConfig.java | 6 +++--- .../codelibs/fess/mylasta/direction/FessProp.java | 12 ++++++++++++ src/main/resources/fess_config.properties | 2 +- 4 files changed, 21 insertions(+), 9 deletions(-) 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 23cabebac3..2432bf7b7c 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java @@ -136,15 +136,15 @@ protected Map generateData(final ResponseData responseData) { 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; + final String dateFormat; if (StringUtil.isNotBlank(mapping.getValue3())) { - dateFormate = mapping.getValue3(); + dateFormat = mapping.getValue3(); } else if (Constants.MAPPING_TYPE_PDF_DATE.equalsIgnoreCase(mapping.getValue2())) { - dateFormate = mapping.getValue2(); + dateFormat = Constants.MAPPING_TYPE_PDF_DATE; } else { - dateFormate = Constants.DATE_OPTIONAL_TIME; + dateFormat = Constants.DATE_OPTIONAL_TIME; } - final Date dt = FessFunctions.parseDate(values[0], dateFormate); + final Date dt = FessFunctions.parseDate(values[0], dateFormat); if (dt != null) { dataMap.put(mapping.getValue1(), FessFunctions.formatDate(dt)); } else { 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 173b38aea6..e26e3d90d1 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java @@ -391,7 +391,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** The key of the configuration. e.g. cpu */ String CRAWLER_HOTTHREAD_TYPE = "crawler.hotthread.type"; - /** The key of the configuration. e.g. resourceName,X-Parsed-By,Content-Encoding.*,Content-Type.*,X-TIKA.* */ + /** The key of the configuration. e.g. resourceName,X-Parsed-By,Content-Encoding.*,Content-Type.*,X-TIKA.*,X-FESS.* */ String CRAWLER_METADATA_CONTENT_EXCLUDES = "crawler.metadata.content.excludes"; /** The key of the configuration. e.g. title=title:string
@@ -2926,7 +2926,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** * Get the value for the key 'crawler.metadata.content.excludes'.
- * The value is, e.g. resourceName,X-Parsed-By,Content-Encoding.*,Content-Type.*,X-TIKA.*
+ * The value is, e.g. resourceName,X-Parsed-By,Content-Encoding.*,Content-Type.*,X-TIKA.*,X-FESS.*
* @return The value of found property. (NotNull: if not found, exception but basically no way) */ String getCrawlerMetadataContentExcludes(); @@ -10899,7 +10899,7 @@ protected java.util.Map prepareGeneratedDefaultMap() { defaultMap.put(FessConfig.CRAWLER_HOTTHREAD_TIMEOUT, "30s"); defaultMap.put(FessConfig.CRAWLER_HOTTHREAD_TYPE, "cpu"); defaultMap.put(FessConfig.CRAWLER_METADATA_CONTENT_EXCLUDES, - "resourceName,X-Parsed-By,Content-Encoding.*,Content-Type.*,X-TIKA.*"); + "resourceName,X-Parsed-By,Content-Encoding.*,Content-Type.*,X-TIKA.*,X-FESS.*"); defaultMap.put(FessConfig.CRAWLER_METADATA_NAME_MAPPING, "title=title:string\nTitle=title:string\ndc:title=title:string\n"); defaultMap.put(FessConfig.CRAWLER_DOCUMENT_HTML_CONTENT_XPATH, "//BODY"); defaultMap.put(FessConfig.CRAWLER_DOCUMENT_HTML_LANG_XPATH, "//HTML/@lang"); 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 c23ddeedf1..3fe8a010c6 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java @@ -975,6 +975,18 @@ default Tuple3 getCrawlerMetadataNameMapping(final Strin return params.get(name); } + default void addCrawlerMetadataNameMapping(final String name, final String fieldName, final String mappingType, + final String dateFormat) { + if (getCrawlerMetadataNameMapping(name) != null) { + return; + } + + @SuppressWarnings("unchecked") + final Map> params = + (Map>) propMap.get(CRAWLER_METADATA_NAME_MAPPING); + params.put(name, new Tuple3<>(fieldName, mappingType, dateFormat)); + } + String getSuggestPopularWordFields(); default String[] getSuggestPopularWordFieldsAsArray() { diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties index 6abdd86479..6fecccc386 100644 --- a/src/main/resources/fess_config.properties +++ b/src/main/resources/fess_config.properties @@ -228,7 +228,7 @@ crawler.hotthread.snapshots=10 crawler.hotthread.threads=3 crawler.hotthread.timeout=30s crawler.hotthread.type=cpu -crawler.metadata.content.excludes=resourceName,X-Parsed-By,Content-Encoding.*,Content-Type.*,X-TIKA.* +crawler.metadata.content.excludes=resourceName,X-Parsed-By,Content-Encoding.*,Content-Type.*,X-TIKA.*,X-FESS.* crawler.metadata.name.mapping=\ title=title:string\n\ Title=title:string\n\ From a26e133b552ca823038d1525c609b41add5e4906 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Sun, 23 Jun 2024 13:12:46 +0900 Subject: [PATCH 41/69] fix #2822 Added configuration option to filter and pass system properties to jobs based on a regex pattern. --- .../java/org/codelibs/fess/job/CrawlJob.java | 1 + .../java/org/codelibs/fess/job/ExecJob.java | 9 +++++++ .../fess/job/GenerateThumbnailJob.java | 1 + .../org/codelibs/fess/job/SuggestJob.java | 1 + .../fess/mylasta/direction/FessConfig.java | 27 +++++++++++++++++++ .../fess/mylasta/direction/FessProp.java | 2 +- src/main/resources/fess_config.properties | 1 + 7 files changed, 41 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/codelibs/fess/job/CrawlJob.java b/src/main/java/org/codelibs/fess/job/CrawlJob.java index 92b4bb2a44..a271f24344 100644 --- a/src/main/java/org/codelibs/fess/job/CrawlJob.java +++ b/src/main/java/org/codelibs/fess/job/CrawlJob.java @@ -274,6 +274,7 @@ protected void executeCrawler() { addFessConfigProperties(cmdList); addFessSystemProperties(cmdList); + addFessCustomSystemProperties(cmdList, fessConfig.getJobSystemPropertyFilterPattern()); addSystemProperty(cmdList, Constants.FESS_CONF_PATH, null, null); cmdList.add("-Dfess." + getExecuteType() + ".process=true"); cmdList.add("-Dfess.log.path=" + (logFilePath != null ? logFilePath : systemHelper.getLogFilePath())); diff --git a/src/main/java/org/codelibs/fess/job/ExecJob.java b/src/main/java/org/codelibs/fess/job/ExecJob.java index 1229ad713e..1730334803 100644 --- a/src/main/java/org/codelibs/fess/job/ExecJob.java +++ b/src/main/java/org/codelibs/fess/job/ExecJob.java @@ -23,6 +23,7 @@ import java.util.Collections; import java.util.List; import java.util.Properties; +import java.util.regex.Pattern; import org.apache.commons.io.FileUtils; import org.apache.logging.log4j.LogManager; @@ -156,6 +157,14 @@ protected void addFessSystemProperties(final List cmdList) { .forEach(k -> addSystemProperty(cmdList, k.toString(), null, null)); } + protected void addFessCustomSystemProperties(final List cmdList, final String regex) { + if (StringUtil.isNotBlank(regex)) { + final Pattern pattern = Pattern.compile(regex); + System.getProperties().keySet().stream().filter(k -> k != null && pattern.matcher(k.toString()).matches()) + .forEach(k -> addSystemProperty(cmdList, k.toString(), null, null)); + } + } + protected void deleteTempDir(final File ownTmpDir) { if (ownTmpDir == null) { return; diff --git a/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java b/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java index f353be6351..71eb791517 100644 --- a/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java +++ b/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java @@ -164,6 +164,7 @@ protected void executeThumbnailGenerator() { addFessConfigProperties(cmdList); addFessSystemProperties(cmdList); + addFessCustomSystemProperties(cmdList, fessConfig.getJobSystemPropertyFilterPattern()); addSystemProperty(cmdList, Constants.FESS_CONF_PATH, null, null); cmdList.add("-Dfess." + getExecuteType() + ".process=true"); if (logFilePath == null) { diff --git a/src/main/java/org/codelibs/fess/job/SuggestJob.java b/src/main/java/org/codelibs/fess/job/SuggestJob.java index 496c665205..46c880f405 100644 --- a/src/main/java/org/codelibs/fess/job/SuggestJob.java +++ b/src/main/java/org/codelibs/fess/job/SuggestJob.java @@ -151,6 +151,7 @@ protected void executeSuggestCreator() { addFessConfigProperties(cmdList); addFessSystemProperties(cmdList); + addFessCustomSystemProperties(cmdList, fessConfig.getJobSystemPropertyFilterPattern()); addSystemProperty(cmdList, Constants.FESS_CONF_PATH, null, null); cmdList.add("-Dfess." + getExecuteType() + ".process=true"); if (logFilePath == null) { 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 e26e3d90d1..a5dd4be3f3 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java @@ -196,6 +196,9 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** The key of the configuration. e.g. groovy */ String JOB_DEFAULT_SCRIPT = "job.default.script"; + /** The key of the configuration. e.g. */ + String JOB_SYSTEM_PROPERTY_FILTER_PATTERN = "job.system.property.filter.pattern"; + /** The key of the configuration. e.g. 0 */ String PROCESSORS = "processors"; @@ -2161,6 +2164,21 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction */ String getJobDefaultScript(); + /** + * Get the value for the key 'job.system.property.filter.pattern'.
+ * The value is, e.g.
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getJobSystemPropertyFilterPattern(); + + /** + * Get the value for the key 'job.system.property.filter.pattern' as {@link Integer}.
+ * The value is, e.g.
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + * @throws NumberFormatException When the property is not integer. + */ + Integer getJobSystemPropertyFilterPatternAsInteger(); + /** * Get the value for the key 'processors'.
* The value is, e.g. 0
@@ -7833,6 +7851,14 @@ public String getJobDefaultScript() { return get(FessConfig.JOB_DEFAULT_SCRIPT); } + public String getJobSystemPropertyFilterPattern() { + return get(FessConfig.JOB_SYSTEM_PROPERTY_FILTER_PATTERN); + } + + public Integer getJobSystemPropertyFilterPatternAsInteger() { + return getAsInteger(FessConfig.JOB_SYSTEM_PROPERTY_FILTER_PATTERN); + } + public String getProcessors() { return get(FessConfig.PROCESSORS); } @@ -10831,6 +10857,7 @@ protected java.util.Map prepareGeneratedDefaultMap() { "return container.getComponent(\"crawlJob\").logLevel(\"info\").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.JOB_DEFAULT_SCRIPT, "groovy"); + defaultMap.put(FessConfig.JOB_SYSTEM_PROPERTY_FILTER_PATTERN, ""); defaultMap.put(FessConfig.PROCESSORS, "0"); defaultMap.put(FessConfig.JAVA_COMMAND_PATH, "java"); defaultMap.put(FessConfig.PYTHON_COMMAND_PATH, "python"); 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 3fe8a010c6..70ff5c94f9 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java @@ -982,7 +982,7 @@ default void addCrawlerMetadataNameMapping(final String name, final String field } @SuppressWarnings("unchecked") - final Map> params = + final Map> params = (Map>) propMap.get(CRAWLER_METADATA_NAME_MAPPING); params.put(name, new Tuple3<>(fieldName, mappingType, dateFormat)); } diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties index 6fecccc386..b1b65b8a91 100644 --- a/src/main/resources/fess_config.properties +++ b/src/main/resources/fess_config.properties @@ -152,6 +152,7 @@ job.template.title.data=Data Crawler - {0} job.template.script=return container.getComponent("crawlJob").logLevel("info").webConfigIds([{0}] as String[]).fileConfigIds([{1}] as String[]).dataConfigIds([{2}] as String[]).jobExecutor(executor).execute(); job.max.crawler.processes=0 job.default.script=groovy +job.system.property.filter.pattern= processors=0 java.command.path=java From a26cf43943da66f8989fd52f5f90ba49aa3d42ec Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Mon, 24 Jun 2024 10:20:17 +0900 Subject: [PATCH 42/69] fix #2823 Log Failure URL ID in CrawlingAccessException in fess.log --- .../fess/app/service/FailureUrlService.java | 5 ++- .../fess/helper/CrawlerLogHelper.java | 42 ++++++++++++------- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java b/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java index d05fd59f71..45ff6d790f 100644 --- a/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java +++ b/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java @@ -128,9 +128,9 @@ public void deleteByConfigId(final String configId) { }); } - public void store(final CrawlingConfig crawlingConfig, final String errorName, final String url, final Throwable e) { + public FailureUrl store(final CrawlingConfig crawlingConfig, final String errorName, final String url, final Throwable e) { if (e instanceof ContainerNotAvailableException) { - return; + return null; } final FailureUrlBhv bhv = ComponentUtil.getComponent(FailureUrlBhv.class); @@ -160,6 +160,7 @@ public void store(final CrawlingConfig crawlingConfig, final String errorName, f bhv.insertOrUpdate(failureUrl, op -> { op.setRefreshPolicy(Constants.TRUE); }); + return failureUrl; } private String getStackTrace(final Throwable t) { diff --git a/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java index 5f61c919f3..d0ef0a190c 100644 --- a/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java +++ b/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java @@ -20,10 +20,12 @@ import org.codelibs.fess.app.service.FailureUrlService; import org.codelibs.fess.crawler.CrawlerContext; import org.codelibs.fess.crawler.entity.UrlQueue; +import org.codelibs.fess.crawler.exception.CrawlingAccessException; import org.codelibs.fess.crawler.exception.MultipleCrawlingAccessException; import org.codelibs.fess.crawler.helper.impl.LogHelperImpl; import org.codelibs.fess.crawler.log.LogType; import org.codelibs.fess.es.config.exentity.CrawlingConfig; +import org.codelibs.fess.es.config.exentity.FailureUrl; import org.codelibs.fess.exception.ContainerNotAvailableException; import org.codelibs.fess.helper.CrawlerStatsHelper.StatsAction; import org.codelibs.fess.util.ComponentUtil; @@ -84,25 +86,30 @@ protected void processFinishedCrawling(final Object... objs) { @Override protected void processCrawlingAccessException(final Object... objs) { + String failureUrlId = "?"; + final CrawlerContext crawlerContext = (CrawlerContext) objs[0]; + final UrlQueue urlQueue = (UrlQueue) objs[1]; + final CrawlingAccessException cae = (CrawlingAccessException) objs[2]; try { - final CrawlerContext crawlerContext = (CrawlerContext) objs[0]; - final UrlQueue urlQueue = (UrlQueue) objs[1]; - Throwable e = (Throwable) objs[2]; - if (e instanceof MultipleCrawlingAccessException) { - final Throwable[] causes = ((MultipleCrawlingAccessException) e).getCauses(); + Throwable t = cae; + if (t instanceof MultipleCrawlingAccessException mcae) { + final Throwable[] causes = mcae.getCauses(); if (causes.length > 0) { - e = causes[causes.length - 1]; + t = causes[causes.length - 1]; } } String errorName; - final Throwable cause = e.getCause(); + final Throwable cause = t.getCause(); if (cause != null) { errorName = cause.getClass().getCanonicalName(); } else { - errorName = e.getClass().getCanonicalName(); + errorName = t.getClass().getCanonicalName(); + } + FailureUrl failureUrl = storeFailureUrl(crawlerContext, urlQueue, errorName, t); + if (failureUrl != null) { + failureUrlId = failureUrl.getId(); } - storeFailureUrl(crawlerContext, urlQueue, errorName, e); } catch (final ContainerNotAvailableException e) { if (logger.isDebugEnabled()) { logger.debug("container was destroyed."); @@ -118,10 +125,17 @@ protected void processCrawlingAccessException(final Object... objs) { logger.warn("Failed to store a failure url.", e); } - super.processCrawlingAccessException(objs); - if (objs.length > 1 && objs[1] instanceof final UrlQueue urlQueue) { - ComponentUtil.getCrawlerStatsHelper().record(urlQueue, StatsAction.ACCESS_EXCEPTION); + if (cae.isDebugEnabled()) { + logger.debug("[{}] Crawling Access Exception at {}", failureUrlId, urlQueue.getUrl(), cae); + } else if (cae.isInfoEnabled()) { + logger.info("[{}] {}", failureUrlId, cae.getMessage()); + } else if (cae.isWarnEnabled()) { + logger.warn("[{}] Crawling Access Exception at {}", failureUrlId, urlQueue.getUrl(), cae); + } else if (cae.isErrorEnabled()) { + logger.error("[{}] Crawling Access Exception at {}", failureUrlId, urlQueue.getUrl(), cae); } + + ComponentUtil.getCrawlerStatsHelper().record(urlQueue, StatsAction.ACCESS_EXCEPTION); } @Override @@ -153,14 +167,14 @@ protected void processCrawlingException(final Object... objs) { } } - protected void storeFailureUrl(final CrawlerContext crawlerContext, final UrlQueue urlQueue, final String errorName, + protected FailureUrl storeFailureUrl(final CrawlerContext crawlerContext, final UrlQueue urlQueue, final String errorName, final Throwable e) { final CrawlingConfig crawlingConfig = getCrawlingConfig(crawlerContext.getSessionId()); final String url = urlQueue.getUrl(); final FailureUrlService failureUrlService = ComponentUtil.getComponent(FailureUrlService.class); - failureUrlService.store(crawlingConfig, errorName, url, e); + return failureUrlService.store(crawlingConfig, errorName, url, e); } protected CrawlingConfig getCrawlingConfig(final String sessionCountId) { From b419ee3f96e03cd3c566311fa758494de97fb45f Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 27 Jun 2024 19:55:43 +0900 Subject: [PATCH 43/69] fix #2824 Convert role names to lowercase for SMB crawling when ldap.lowercase.permission.name=true --- .../org/codelibs/fess/helper/SambaHelper.java | 5 + .../codelibs/fess/helper/SambaHelperTest.java | 124 ++++++++++++++++++ 2 files changed, 129 insertions(+) create mode 100644 src/test/java/org/codelibs/fess/helper/SambaHelperTest.java diff --git a/src/main/java/org/codelibs/fess/helper/SambaHelper.java b/src/main/java/org/codelibs/fess/helper/SambaHelper.java index c3acd1926b..2ec7c00cd2 100644 --- a/src/main/java/org/codelibs/fess/helper/SambaHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SambaHelper.java @@ -15,6 +15,8 @@ */ package org.codelibs.fess.helper; +import java.util.Locale; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.fess.mylasta.direction.FessConfig; @@ -94,6 +96,9 @@ public String getAccountId(final jcifs.smb1.smb1.SID sid) { } protected String createSearchRole(final int type, final String name) { + if (fessConfig.isLdapLowercasePermissionName()) { + return type + fessConfig.getCanonicalLdapName(name).toLowerCase(Locale.ROOT); + } return type + fessConfig.getCanonicalLdapName(name); } } diff --git a/src/test/java/org/codelibs/fess/helper/SambaHelperTest.java b/src/test/java/org/codelibs/fess/helper/SambaHelperTest.java new file mode 100644 index 0000000000..c878dd44e6 --- /dev/null +++ b/src/test/java/org/codelibs/fess/helper/SambaHelperTest.java @@ -0,0 +1,124 @@ +/* + * Copyright 2012-2024 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.helper; + +import org.codelibs.fess.mylasta.direction.FessConfig; +import org.codelibs.fess.unit.UnitFessTestCase; +import org.codelibs.fess.util.ComponentUtil; + +import jcifs.SID; +import jcifs.smb.SmbException; + +public class SambaHelperTest extends UnitFessTestCase { + + public SambaHelper sambaHelper; + + @Override + public void setUp() throws Exception { + super.setUp(); + sambaHelper = new SambaHelper(); + } + + public void test_smb_account() throws SmbException { + ComponentUtil.setFessConfig(new FessConfig.SimpleImpl() { + @Override + public String getSmbAvailableSidTypes() { + return "1,2,4:2,5:1"; + } + + @Override + public boolean isLdapLowercasePermissionName() { + return false; + } + + @Override + public boolean isLdapIgnoreNetbiosName() { + return false; + } + }); + sambaHelper.init(); + + assertEquals("1Test User", sambaHelper.getAccountId(USER_SID)); + + } + + public void test_smb_account_lowercase() throws SmbException { + ComponentUtil.setFessConfig(new FessConfig.SimpleImpl() { + @Override + public String getSmbAvailableSidTypes() { + return "1,2,4:2,5:1"; + } + + @Override + public boolean isLdapLowercasePermissionName() { + return true; + } + + @Override + public boolean isLdapIgnoreNetbiosName() { + return false; + } + }); + sambaHelper.init(); + + assertEquals("1test user", sambaHelper.getAccountId(USER_SID)); + + } + + private static final SID USER_SID = new SID() { + + @Override + public SID getDomainSid() { + return null; + } + + @Override + public int getRid() { + return 0; + } + + @Override + public String toDisplayString() { + return getDomainName() + "\\" + getAccountName(); + } + + @Override + public String getAccountName() { + return "Test User"; + } + + @Override + public String getDomainName() { + return "WORKGROUP"; + } + + @Override + public String getTypeText() { + return "User"; + } + + @Override + public int getType() { + return 1; + } + + @Override + public T unwrap(Class type) { + return null; + } + }; + +} From d0929b5994ef9967bd581038682e5cfc0ff0fb46 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 4 Jul 2024 15:20:49 +0900 Subject: [PATCH 44/69] fix #2826 Added support for defining field configurations via field.config.fieldname in crawl settings. --- .../AbstractFessFileTransformer.java | 7 +- .../crawler/transformer/FessTransformer.java | 15 ++++ .../transformer/FessXpathTransformer.java | 14 ++-- .../fess/crawler/util/FieldConfigs.java | 76 +++++++++++++++++++ .../transformer/FessFileTransformerTest.java | 18 +++++ .../transformer/FessXpathTransformerTest.java | 25 +++++- .../fess/crawler/util/FieldConfigsTest.java | 71 +++++++++++++++++ 7 files changed, 214 insertions(+), 12 deletions(-) create mode 100644 src/main/java/org/codelibs/fess/crawler/util/FieldConfigs.java create mode 100644 src/test/java/org/codelibs/fess/crawler/util/FieldConfigsTest.java 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 2432bf7b7c..af0fce7f48 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java @@ -44,6 +44,7 @@ import org.codelibs.fess.crawler.extractor.impl.TikaExtractor; import org.codelibs.fess.crawler.transformer.impl.AbstractTransformer; import org.codelibs.fess.crawler.util.CrawlingParameterUtil; +import org.codelibs.fess.crawler.util.FieldConfigs; import org.codelibs.fess.es.config.exentity.CrawlingConfig; import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName; import org.codelibs.fess.es.config.exentity.CrawlingConfig.Param.Config; @@ -181,7 +182,7 @@ protected Map generateData(final ResponseData responseData) { final String indexingTarget = crawlingConfig.getIndexingTarget(url); url = pathMappingHelper.replaceUrl(sessionId, url); - final Map fieldConfigMap = crawlingConfig.getConfigParameterMap(ConfigName.FIELD); + final FieldConfigs fieldConfigs = new FieldConfigs(crawlingConfig.getConfigParameterMap(ConfigName.FIELD)); String urlEncoding; final UrlQueue urlQueue = CrawlingParameterUtil.getUrlQueue(); @@ -221,7 +222,7 @@ protected Map generateData(final ResponseData responseData) { 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())) + if ((fieldConfigs.getConfig(fessConfig.getIndexFieldCache()).map(config -> config.isCache()).orElse(false) || fessConfig.isCrawlerDocumentCacheEnabled()) && fessConfig.isSupportedDocumentCacheMimetypes(mimeType)) { if (responseData.getContentLength() > 0 && responseData.getContentLength() <= fessConfig.getCrawlerDocumentCacheMaxSizeAsInteger().longValue()) { @@ -334,7 +335,7 @@ protected Map generateData(final ResponseData responseData) { putResultDataWithTemplate(dataMap, key, entry.getValue(), scriptConfigMap.get(key), scriptType); } - return dataMap; + return processFieldConfigs(dataMap, fieldConfigs); } protected Date getLastModified(final Map dataMap, final ResponseData responseData) { diff --git a/src/main/java/org/codelibs/fess/crawler/transformer/FessTransformer.java b/src/main/java/org/codelibs/fess/crawler/transformer/FessTransformer.java index 9f4933f871..77430ebe99 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/FessTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/FessTransformer.java @@ -20,6 +20,7 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import org.apache.commons.lang3.StringUtils; @@ -31,6 +32,7 @@ import org.codelibs.fess.crawler.entity.AccessResultData; import org.codelibs.fess.crawler.entity.UrlQueue; import org.codelibs.fess.crawler.util.CrawlingParameterUtil; +import org.codelibs.fess.crawler.util.FieldConfigs; import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.util.ComponentUtil; @@ -248,4 +250,17 @@ default String getParentEncoding(final String parentUrl, final String sessionId) } return null; } + + default Map processFieldConfigs(final Map dataMap, final FieldConfigs fieldConfigs) { + final Map newDataMap = new LinkedHashMap<>(); + for (Map.Entry e : dataMap.entrySet()) { + if (fieldConfigs.getConfig(e.getKey()).map(FieldConfigs.Config::isOverwrite).orElse(false) + && e.getValue() instanceof Object[] values && values.length > 0) { + newDataMap.put(e.getKey(), values[values.length - 1]); + } else { + newDataMap.put(e.getKey(), e.getValue()); + } + } + return newDataMap; + } } 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 b7d35bfec1..56bc954aee 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java @@ -55,6 +55,7 @@ import org.codelibs.fess.crawler.exception.CrawlingAccessException; import org.codelibs.fess.crawler.transformer.impl.XpathTransformer; import org.codelibs.fess.crawler.util.CrawlingParameterUtil; +import org.codelibs.fess.crawler.util.FieldConfigs; import org.codelibs.fess.es.config.exentity.CrawlingConfig; import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName; import org.codelibs.fess.es.config.exentity.CrawlingConfig.Param.Config; @@ -153,7 +154,7 @@ protected void storeData(final ResponseData responseData, final ResultData resul processMetaRobots(responseData, resultData, document); processXRobotsTag(responseData, resultData); - final Map dataMap = new LinkedHashMap<>(); + Map dataMap = new LinkedHashMap<>(); for (final Map.Entry entry : fieldRuleMap.entrySet()) { final String path = entry.getValue(); try { @@ -185,7 +186,7 @@ protected void storeData(final ResponseData responseData, final ResultData resul } } - putAdditionalData(dataMap, responseData, document); + dataMap = processAdditionalData(dataMap, responseData, document); normalizeData(responseData, dataMap); try { @@ -337,7 +338,8 @@ protected boolean isValidCanonicalUrl(final String url, final String canonicalUr return true; } - protected void putAdditionalData(final Map dataMap, final ResponseData responseData, final Document document) { + protected Map processAdditionalData(final Map dataMap, final ResponseData responseData, + final Document document) { // canonical final String canonicalUrl = getCanonicalUrl(responseData, document); if (canonicalUrl != null && !canonicalUrl.equals(responseData.getUrl()) && isValidUrl(canonicalUrl) @@ -363,7 +365,7 @@ && isValidCanonicalUrl(responseData.getUrl(), canonicalUrl)) { url = pathMappingHelper.replaceUrl(sessionId, url); final String mimeType = responseData.getMimeType(); - final Map fieldConfigMap = crawlingConfig.getConfigParameterMap(ConfigName.FIELD); + final FieldConfigs fieldConfigs = new FieldConfigs(crawlingConfig.getConfigParameterMap(ConfigName.FIELD)); final Map xpathConfigMap = crawlingConfig.getConfigParameterMap(ConfigName.XPATH); String urlEncoding; @@ -395,7 +397,7 @@ && isValidCanonicalUrl(responseData.getUrl(), canonicalUrl)) { prunedContent ? node -> pruneNode(node, crawlingConfig) : node -> node); final String fileName = getFileName(url, urlEncoding); putResultDataContent(dataMap, responseData, fessConfig, crawlingConfig, documentHelper, body, fileName); - if ((Constants.TRUE.equalsIgnoreCase(fieldConfigMap.get(fessConfig.getIndexFieldCache())) + if ((fieldConfigs.getConfig(fessConfig.getIndexFieldCache()).map(config -> config.isCache()).orElse(false) || fessConfig.isCrawlerDocumentCacheEnabled()) && fessConfig.isSupportedDocumentCacheMimetypes(mimeType)) { if (responseData.getContentLength() > 0 && responseData.getContentLength() <= fessConfig.getCrawlerDocumentCacheMaxSizeAsInteger().longValue()) { @@ -500,6 +502,8 @@ && isValidCanonicalUrl(responseData.getUrl(), canonicalUrl)) { final String value = e.getValue(); putResultDataWithTemplate(dataMap, key, value, scriptConfigMap.get(key), scriptType); }); + + return processFieldConfigs(dataMap, fieldConfigs); } protected void putResultDataContent(final Map dataMap, final ResponseData responseData, final FessConfig fessConfig, diff --git a/src/main/java/org/codelibs/fess/crawler/util/FieldConfigs.java b/src/main/java/org/codelibs/fess/crawler/util/FieldConfigs.java new file mode 100644 index 0000000000..112819466b --- /dev/null +++ b/src/main/java/org/codelibs/fess/crawler/util/FieldConfigs.java @@ -0,0 +1,76 @@ +/* + * Copyright 2012-2024 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.crawler.util; + +import java.util.Map; +import java.util.regex.Pattern; + +import org.codelibs.core.lang.StringUtil; +import org.codelibs.core.stream.StreamUtil; +import org.codelibs.fess.Constants; +import org.dbflute.optional.OptionalThing; + +public class FieldConfigs { + + private final Map params; + + public FieldConfigs(Map params) { + this.params = params; + } + + public OptionalThing getConfig(String fieldName) { + String value = params.get(fieldName); + if (StringUtil.isNotBlank(value)) { + return OptionalThing.of(new Config(value)); + } + return OptionalThing.empty(); + } + + public static class Config { + + private final String[] values; + + public Config(String value) { + values = StreamUtil.split(value, Pattern.quote("|")).get(stream -> stream.map(s -> s.trim()).toArray(n -> new String[n])); + } + + public boolean isCache() { + for (final String value : values) { + if ("cache".equalsIgnoreCase(value)) { + return true; + } + } + // backward compatibility + if (values.length == 1 && Constants.TRUE.equalsIgnoreCase(values[0])) { + return true; + } + return false; + } + + public boolean isOverwrite() { + for (final String value : values) { + if ("overwrite".equalsIgnoreCase(value)) { + return true; + } + } + return false; + } + + public String[] getValues() { + return values; + } + } +} diff --git a/src/test/java/org/codelibs/fess/crawler/transformer/FessFileTransformerTest.java b/src/test/java/org/codelibs/fess/crawler/transformer/FessFileTransformerTest.java index 5de72b8342..8b587e195e 100644 --- a/src/test/java/org/codelibs/fess/crawler/transformer/FessFileTransformerTest.java +++ b/src/test/java/org/codelibs/fess/crawler/transformer/FessFileTransformerTest.java @@ -17,8 +17,11 @@ import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.util.Map; +import org.apache.groovy.util.Maps; import org.codelibs.fess.Constants; +import org.codelibs.fess.crawler.util.FieldConfigs; import org.codelibs.fess.exception.FessSystemException; import org.codelibs.fess.unit.UnitFessTestCase; @@ -269,6 +272,21 @@ public void test_getSite_unexpected() { assertEquals(exp, transformer.getSiteOnFile(url, "UTF-8")); } + public void test_processFieldConfigs() { + final FessFileTransformer transformer = createInstance(); + final Map params = Maps.of("foo", "cache", "bar", "overwrite", "baz", "cache|overwrite"); + FieldConfigs fieldConfigs = new FieldConfigs(params); + final Map dataMap = Map.of(// + "foo", new String[] { "aaa", "bbb" }, // + "bar", new String[] { "ccc", "ddd" }, // + "baz", new String[] { "eee", "fff" }); + final Map resultMap = transformer.processFieldConfigs(dataMap, fieldConfigs); + assertEquals("aaa", ((String[]) resultMap.get("foo"))[0]); + assertEquals("bbb", ((String[]) resultMap.get("foo"))[1]); + assertEquals("ddd", resultMap.get("bar")); + assertEquals("fff", resultMap.get("baz")); + } + private FessFileTransformer createInstance() { final FessFileTransformer transformer = new FessFileTransformer(); transformer.init(); 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 6d5776adc6..3fbedfab7f 100644 --- a/src/test/java/org/codelibs/fess/crawler/transformer/FessXpathTransformerTest.java +++ b/src/test/java/org/codelibs/fess/crawler/transformer/FessXpathTransformerTest.java @@ -32,6 +32,7 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import org.apache.groovy.util.Maps; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.ClassUtil; @@ -42,6 +43,7 @@ import org.codelibs.fess.crawler.entity.ResponseData; import org.codelibs.fess.crawler.entity.ResultData; import org.codelibs.fess.crawler.exception.ChildUrlsException; +import org.codelibs.fess.crawler.util.FieldConfigs; import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName; import org.codelibs.fess.es.config.exentity.WebConfig; import org.codelibs.fess.helper.CrawlingConfigHelper; @@ -626,7 +628,7 @@ protected Map getConfigPrameterMap(final ResponseData responseDa String data = "aaa"; Document document = getDocument(data); try { - transformer.putAdditionalData(dataMap, responseData, document); + transformer.processAdditionalData(dataMap, responseData, document); fail(); } catch (final ComponentNotFoundException e) { // ignore @@ -635,7 +637,7 @@ protected Map getConfigPrameterMap(final ResponseData responseDa data = "aaa"; document = getDocument(data); try { - transformer.putAdditionalData(dataMap, responseData, document); + transformer.processAdditionalData(dataMap, responseData, document); fail(); } catch (final ComponentNotFoundException e) { // ignore @@ -644,7 +646,7 @@ protected Map getConfigPrameterMap(final ResponseData responseDa data = "aaa"; document = getDocument(data); try { - transformer.putAdditionalData(dataMap, responseData, document); + transformer.processAdditionalData(dataMap, responseData, document); fail(); } catch (final ChildUrlsException e) { final Set childUrlList = e.getChildUrlList(); @@ -655,7 +657,7 @@ protected Map getConfigPrameterMap(final ResponseData responseDa data = "aaa"; document = getDocument(data); try { - transformer.putAdditionalData(dataMap, responseData, document); + transformer.processAdditionalData(dataMap, responseData, document); fail(); } catch (final ChildUrlsException e) { final Set childUrlList = e.getChildUrlList(); @@ -904,4 +906,19 @@ public void test_isValidUrl() { assertFalse(transformer.isValidUrl("http://")); assertFalse(transformer.isValidUrl("http://http://www.example.com")); } + + public void test_processFieldConfigs() { + final FessXpathTransformer transformer = new FessXpathTransformer(); + final Map params = Maps.of("foo", "cache", "bar", "overwrite", "baz", "cache|overwrite"); + FieldConfigs fieldConfigs = new FieldConfigs(params); + final Map dataMap = Map.of(// + "foo", new String[] { "aaa", "bbb" }, // + "bar", new String[] { "ccc", "ddd" }, // + "baz", new String[] { "eee", "fff" }); + final Map resultMap = transformer.processFieldConfigs(dataMap, fieldConfigs); + assertEquals("aaa", ((String[]) resultMap.get("foo"))[0]); + assertEquals("bbb", ((String[]) resultMap.get("foo"))[1]); + assertEquals("ddd", resultMap.get("bar")); + assertEquals("fff", resultMap.get("baz")); + } } diff --git a/src/test/java/org/codelibs/fess/crawler/util/FieldConfigsTest.java b/src/test/java/org/codelibs/fess/crawler/util/FieldConfigsTest.java new file mode 100644 index 0000000000..7a6b3049f1 --- /dev/null +++ b/src/test/java/org/codelibs/fess/crawler/util/FieldConfigsTest.java @@ -0,0 +1,71 @@ +/* + * Copyright 2012-2024 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.crawler.util; + +import java.util.Collections; +import java.util.Map; + +import org.apache.groovy.util.Maps; +import org.codelibs.fess.unit.UnitFessTestCase; + +public class FieldConfigsTest extends UnitFessTestCase { + public void test_empty() { + final FieldConfigs fieldConfigs = new FieldConfigs(Collections.emptyMap()); + assertTrue(fieldConfigs.getConfig("test").isEmpty()); + } + + public void test_values() { + final Map params = Maps.of("foo", "bar"); + FieldConfigs fieldConfigs = new FieldConfigs(params); + assertTrue(fieldConfigs.getConfig("test").isEmpty()); + assertFalse(fieldConfigs.getConfig("foo").isEmpty()); + assertFalse(fieldConfigs.getConfig("foo").map(FieldConfigs.Config::isCache).orElse(false)); + assertFalse(fieldConfigs.getConfig("foo").map(FieldConfigs.Config::isOverwrite).orElse(false)); + assertEquals("bar", fieldConfigs.getConfig("foo").map(FieldConfigs.Config::getValues).orElse(new String[0])[0]); + } + + public void test_cache_true() { + final Map params = Maps.of("foo", "true"); + FieldConfigs fieldConfigs = new FieldConfigs(params); + assertTrue(fieldConfigs.getConfig("test").isEmpty()); + assertTrue(fieldConfigs.getConfig("foo").map(FieldConfigs.Config::isCache).orElse(false)); + assertFalse(fieldConfigs.getConfig("foo").map(FieldConfigs.Config::isOverwrite).orElse(false)); + } + + public void test_cache() { + final Map params = Maps.of("foo", "cache"); + FieldConfigs fieldConfigs = new FieldConfigs(params); + assertTrue(fieldConfigs.getConfig("test").isEmpty()); + assertTrue(fieldConfigs.getConfig("foo").map(FieldConfigs.Config::isCache).orElse(false)); + assertFalse(fieldConfigs.getConfig("foo").map(FieldConfigs.Config::isOverwrite).orElse(false)); + } + + public void test_overwrite() { + final Map params = Maps.of("foo", "overwrite"); + FieldConfigs fieldConfigs = new FieldConfigs(params); + assertTrue(fieldConfigs.getConfig("test").isEmpty()); + assertFalse(fieldConfigs.getConfig("foo").map(FieldConfigs.Config::isCache).orElse(false)); + assertTrue(fieldConfigs.getConfig("foo").map(FieldConfigs.Config::isOverwrite).orElse(false)); + } + + public void test_cache_overwrite() { + final Map params = Maps.of("foo", "cache|overwrite"); + FieldConfigs fieldConfigs = new FieldConfigs(params); + assertTrue(fieldConfigs.getConfig("test").isEmpty()); + assertTrue(fieldConfigs.getConfig("foo").map(FieldConfigs.Config::isCache).orElse(false)); + assertTrue(fieldConfigs.getConfig("foo").map(FieldConfigs.Config::isOverwrite).orElse(false)); + } +} From a21cea6ffe88610d87008f2390b25a8a32ac323b Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Fri, 5 Jul 2024 12:33:18 +0900 Subject: [PATCH 45/69] fix #2827 Add CPU load calibration during search log download to prevent high CPU usage. --- .../web/admin/backup/AdminBackupAction.java | 204 +++++++++++------- .../codelibs/fess/helper/SystemHelper.java | 19 +- .../fess/mylasta/direction/FessConfig.java | 27 +++ src/main/resources/fess_config.properties | 1 + 4 files changed, 171 insertions(+), 80 deletions(-) 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 357be1de29..e22245244b 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 @@ -61,12 +61,18 @@ import org.codelibs.fess.es.log.exbhv.FavoriteLogBhv; import org.codelibs.fess.es.log.exbhv.SearchLogBhv; import org.codelibs.fess.es.log.exbhv.UserInfoBhv; +import org.codelibs.fess.es.log.exentity.ClickLog; +import org.codelibs.fess.es.log.exentity.FavoriteLog; +import org.codelibs.fess.es.log.exentity.SearchLog; +import org.codelibs.fess.es.log.exentity.UserInfo; +import org.codelibs.fess.helper.SystemHelper; import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.util.GsaConfigParser; import org.codelibs.fess.util.RenderDataUtil; import org.codelibs.fess.util.ResourceUtil; import org.codelibs.fess.util.SearchEngineUtil; +import org.dbflute.bhv.readable.EntityRowHandler; import org.lastaflute.core.magic.async.AsyncManager; import org.lastaflute.web.Execute; import org.lastaflute.web.response.ActionResponse; @@ -431,121 +437,157 @@ private static StringBuilder appendJson(final String field, final Object value, } public static Consumer getSearchLogNdjsonWriteCall() { + final FessConfig fessConfig = ComponentUtil.getFessConfig(); + final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); + final long timeout = fessConfig.getIndexBackupLogLoadTimeoutAsInteger().longValue(); 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> searchFieldMap = entity.getSearchFieldLogList().stream() - .collect(Collectors.groupingBy(Pair::getFirst, Collectors.mapping(Pair::getSecond, Collectors.toList()))); - appendJson("search-field", searchFieldMap, buf).append(','); - final Map> requestHeaderMap = entity.getRequestHeaderList().stream() - .collect(Collectors.groupingBy(Pair::getFirst, Collectors.mapping(Pair::getSecond, Collectors.toList()))); - appendJson("headers", requestHeaderMap, buf); - buf.append('}'); - buf.append('\n'); - try { - writer.write(buf.toString()); - } catch (final IOException e) { - throw new IORuntimeException(e); + }, new LogEntityRowHandler() { + @Override + public void handle(final SearchLog 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> searchFieldMap = entity.getSearchFieldLogList().stream() + .collect(Collectors.groupingBy(Pair::getFirst, Collectors.mapping(Pair::getSecond, Collectors.toList()))); + appendJson("search-field", searchFieldMap, buf).append(','); + final Map> requestHeaderMap = entity.getRequestHeaderList().stream() + .collect(Collectors.groupingBy(Pair::getFirst, Collectors.mapping(Pair::getSecond, Collectors.toList()))); + appendJson("headers", requestHeaderMap, buf); + buf.append('}'); + buf.append('\n'); + try { + writer.write(buf.toString()); + } catch (final IOException e) { + throw new IORuntimeException(e); + } + if (!systemHelper.calibrateCpuLoad(timeout)) { + breakCursor = true; + } } }); }; } public static Consumer getUserInfoNdjsonWriteCall() { + final FessConfig fessConfig = ComponentUtil.getFessConfig(); + final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); + final long timeout = fessConfig.getIndexBackupLogLoadTimeoutAsInteger().longValue(); return writer -> { final UserInfoBhv bhv = ComponentUtil.getComponent(UserInfoBhv.class); bhv.selectCursor(cb -> { cb.query().matchAll(); cb.query().addOrderBy_CreatedAt_Asc(); - }, entity -> { - final StringBuilder buf = new StringBuilder(); - buf.append('{'); - appendJson("id", entity.getId(), buf).append(','); - appendJson("created-at", entity.getCreatedAt(), buf).append(','); - appendJson("updated-at", entity.getUpdatedAt(), buf); - buf.append('}'); - buf.append('\n'); - try { - writer.write(buf.toString()); - } catch (final IOException e) { - throw new IORuntimeException(e); + }, new LogEntityRowHandler() { + @Override + public void handle(final UserInfo entity) { + final StringBuilder buf = new StringBuilder(); + buf.append('{'); + appendJson("id", entity.getId(), buf).append(','); + appendJson("created-at", entity.getCreatedAt(), buf).append(','); + appendJson("updated-at", entity.getUpdatedAt(), buf); + buf.append('}'); + buf.append('\n'); + try { + writer.write(buf.toString()); + } catch (final IOException e) { + throw new IORuntimeException(e); + } + if (!systemHelper.calibrateCpuLoad(timeout)) { + breakCursor = true; + } } }); }; } public static Consumer getFavoriteLogNdjsonWriteCall() { + final FessConfig fessConfig = ComponentUtil.getFessConfig(); + final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); + final long timeout = fessConfig.getIndexBackupLogLoadTimeoutAsInteger().longValue(); return writer -> { final FavoriteLogBhv bhv = ComponentUtil.getComponent(FavoriteLogBhv.class); bhv.selectCursor(cb -> { cb.query().matchAll(); cb.query().addOrderBy_CreatedAt_Asc(); - }, entity -> { - final StringBuilder buf = new StringBuilder(); - buf.append('{'); - appendJson("id", entity.getId(), buf).append(','); - appendJson("created-at", entity.getCreatedAt(), buf).append(','); - appendJson("query-id", entity.getQueryId(), buf).append(','); - appendJson("user-info-id", entity.getUserInfoId(), buf).append(','); - appendJson("doc-id", entity.getDocId(), buf).append(','); - appendJson("url", entity.getUrl(), buf); - buf.append('}'); - buf.append('\n'); - try { - writer.write(buf.toString()); - } catch (final IOException e) { - throw new IORuntimeException(e); + }, new LogEntityRowHandler() { + @Override + public void handle(final FavoriteLog entity) { + final StringBuilder buf = new StringBuilder(); + buf.append('{'); + appendJson("id", entity.getId(), buf).append(','); + appendJson("created-at", entity.getCreatedAt(), buf).append(','); + appendJson("query-id", entity.getQueryId(), buf).append(','); + appendJson("user-info-id", entity.getUserInfoId(), buf).append(','); + appendJson("doc-id", entity.getDocId(), buf).append(','); + appendJson("url", entity.getUrl(), buf); + buf.append('}'); + buf.append('\n'); + try { + writer.write(buf.toString()); + } catch (final IOException e) { + throw new IORuntimeException(e); + } + if (!systemHelper.calibrateCpuLoad(timeout)) { + breakCursor = true; + } } }); }; } public static Consumer getClickLogNdjsonWriteCall() { + final FessConfig fessConfig = ComponentUtil.getFessConfig(); + final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); + final long timeout = fessConfig.getIndexBackupLogLoadTimeoutAsInteger().longValue(); return writer -> { final ClickLogBhv bhv = ComponentUtil.getComponent(ClickLogBhv.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-session-id", entity.getUserSessionId(), buf).append(','); - appendJson("doc-id", entity.getDocId(), buf).append(','); - appendJson("url", entity.getUrl(), buf).append(','); - appendJson("order", entity.getOrder(), buf).append(','); - appendJson("query-requested-at", entity.getQueryRequestedAt(), buf).append(','); - appendJson("requested-at", entity.getRequestedAt(), buf); - buf.append('}'); - buf.append('\n'); - try { - writer.write(buf.toString()); - } catch (final IOException e) { - throw new IORuntimeException(e); + }, new LogEntityRowHandler() { + @Override + public void handle(final ClickLog entity) { + final StringBuilder buf = new StringBuilder(); + buf.append('{'); + appendJson("id", entity.getId(), buf).append(','); + appendJson("query-id", entity.getQueryId(), buf).append(','); + appendJson("user-session-id", entity.getUserSessionId(), buf).append(','); + appendJson("doc-id", entity.getDocId(), buf).append(','); + appendJson("url", entity.getUrl(), buf).append(','); + appendJson("order", entity.getOrder(), buf).append(','); + appendJson("query-requested-at", entity.getQueryRequestedAt(), buf).append(','); + appendJson("requested-at", entity.getRequestedAt(), buf); + buf.append('}'); + buf.append('\n'); + try { + writer.write(buf.toString()); + } catch (final IOException e) { + throw new IORuntimeException(e); + } + if (!systemHelper.calibrateCpuLoad(timeout)) { + breakCursor = true; + } } }); }; @@ -572,4 +614,12 @@ private void deleteTempFile(final File tempFile) { } } + private static abstract class LogEntityRowHandler implements EntityRowHandler { + protected boolean breakCursor = false; + + @Override + public boolean isBreakCursor() { + return breakCursor; + } + } } diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java index b3bc871a69..532af0f612 100644 --- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java @@ -602,19 +602,31 @@ public File createTempFile(final String prefix, final String suffix) { } } - public void calibrateCpuLoad() { + public boolean calibrateCpuLoad() { + return calibrateCpuLoad(0L); + } + + public boolean calibrateCpuLoad(final long timeoutInMillis) { final short percent = ComponentUtil.getFessConfig().getAdaptiveLoadControlAsInteger().shortValue(); if (percent <= 0) { - return; + return true; } short current = getSystemCpuPercent(); if (current < percent) { - return; + return true; } + final long startTime = getCurrentTimeAsLong(); final String threadName = Thread.currentThread().getName(); try { waitingThreadNames.add(threadName); while (current >= percent) { + if (timeoutInMillis > 0 && getCurrentTimeAsLong() - startTime > timeoutInMillis) { + if (logger.isInfoEnabled()) { + logger.info("Cpu Load {}% is greater than {}%. {} waiting thread(s). {} thread is timed out.", current, percent, + waitingThreadNames.size(), threadName); + } + return false; + } if (logger.isInfoEnabled()) { logger.info("Cpu Load {}% is greater than {}%. {} waiting thread(s).", current, percent, waitingThreadNames.size()); } @@ -627,6 +639,7 @@ public void calibrateCpuLoad() { } finally { waitingThreadNames.remove(threadName); } + return true; } public void waitForNoWaitingThreads() { 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 a5dd4be3f3..28c44a185c 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java @@ -1176,6 +1176,9 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** The key of the configuration. e.g. click_log.ndjson,favorite_log.ndjson,search_log.ndjson,user_info.ndjson */ String INDEX_BACKUP_LOG_TARGETS = "index.backup.log.targets"; + /** The key of the configuration. e.g. 60000 */ + String INDEX_BACKUP_LOG_LOAD_TIMEOUT = "index.backup.log.load.timeout"; + /** The key of the configuration. e.g. true */ String LOGGING_SEARCH_DOCS_ENABLED = "logging.search.docs.enabled"; @@ -5505,6 +5508,21 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction */ String getIndexBackupLogTargets(); + /** + * Get the value for the key 'index.backup.log.load.timeout'.
+ * The value is, e.g. 60000
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getIndexBackupLogLoadTimeout(); + + /** + * Get the value for the key 'index.backup.log.load.timeout' as {@link Integer}.
+ * The value is, e.g. 60000
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + * @throws NumberFormatException When the property is not integer. + */ + Integer getIndexBackupLogLoadTimeoutAsInteger(); + /** * Get the value for the key 'logging.search.docs.enabled'.
* The value is, e.g. true
@@ -9611,6 +9629,14 @@ public String getIndexBackupLogTargets() { return get(FessConfig.INDEX_BACKUP_LOG_TARGETS); } + public String getIndexBackupLogLoadTimeout() { + return get(FessConfig.INDEX_BACKUP_LOG_LOAD_TIMEOUT); + } + + public Integer getIndexBackupLogLoadTimeoutAsInteger() { + return getAsInteger(FessConfig.INDEX_BACKUP_LOG_LOAD_TIMEOUT); + } + public String getLoggingSearchDocsEnabled() { return get(FessConfig.LOGGING_SEARCH_DOCS_ENABLED); } @@ -11155,6 +11181,7 @@ protected java.util.Map prepareGeneratedDefaultMap() { defaultMap.put(FessConfig.INDEX_BACKUP_TARGETS, "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.INDEX_BACKUP_LOG_LOAD_TIMEOUT, "60000"); 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"); diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties index b1b65b8a91..2060037d61 100644 --- a/src/main/resources/fess_config.properties +++ b/src/main/resources/fess_config.properties @@ -621,6 +621,7 @@ ftp.role.from.file=true # backup index.backup.targets=fess_basic_config.bulk,fess_config.bulk,fess_user.bulk,system.properties,fess.json,doc.json index.backup.log.targets=click_log.ndjson,favorite_log.ndjson,search_log.ndjson,user_info.ndjson +index.backup.log.load.timeout=60000 # logging logging.search.docs.enabled=true From 7ee6b77a60e0de86c685abf136f68ba39ecf5276 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 11 Jul 2024 17:26:36 +0900 Subject: [PATCH 46/69] fix #2828 Add configurable DisMax query support for default field searches --- .../fess/mylasta/direction/FessConfig.java | 69 ++++++++ .../fess/query/DefaultQueryBuilder.java | 148 ++++++++++++++++++ .../org/codelibs/fess/query/QueryCommand.java | 39 +++-- .../codelibs/fess/query/TermQueryCommand.java | 9 +- src/main/resources/fess_config.properties | 4 + .../codelibs/fess/helper/QueryHelperTest.java | 65 ++++++++ .../fess/query/DefaultQueryBuilderTest.java | 39 +++++ .../fess/query/TermQueryCommandTest.java | 69 +++++++- 8 files changed, 425 insertions(+), 17 deletions(-) create mode 100644 src/main/java/org/codelibs/fess/query/DefaultQueryBuilder.java create mode 100644 src/test/java/org/codelibs/fess/query/DefaultQueryBuilderTest.java 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 28c44a185c..92b6452fdc 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java @@ -1110,6 +1110,15 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** The key of the configuration. e.g. true */ String QUERY_BOOST_FUZZY_CONTENT_TRANSPOSITIONS = "query.boost.fuzzy.content.transpositions"; + /** The key of the configuration. e.g. bool */ + String QUERY_DEFAULT_query_type = "query.default.query_type"; + + /** The key of the configuration. e.g. 0.1 */ + String QUERY_DISMAX_tie_breaker = "query.dismax.tie_breaker"; + + /** The key of the configuration. e.g. */ + String QUERY_BOOL_minimum_should_match = "query.bool.minimum_should_match"; + /** The key of the configuration. e.g. 50 */ String QUERY_PREFIX_EXPANSIONS = "query.prefix.expansions"; @@ -5244,6 +5253,43 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction */ boolean isQueryBoostFuzzyContentTranspositions(); + /** + * Get the value for the key 'query.default.query_type'.
+ * The value is, e.g. bool
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getQueryDefaultQueryType(); + + /** + * Get the value for the key 'query.dismax.tie_breaker'.
+ * The value is, e.g. 0.1
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getQueryDismaxTieBreaker(); + + /** + * Get the value for the key 'query.dismax.tie_breaker' as {@link java.math.BigDecimal}.
+ * The value is, e.g. 0.1
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + * @throws NumberFormatException When the property is not decimal. + */ + java.math.BigDecimal getQueryDismaxTieBreakerAsDecimal(); + + /** + * Get the value for the key 'query.bool.minimum_should_match'.
+ * The value is, e.g.
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getQueryBoolMinimumShouldMatch(); + + /** + * Get the value for the key 'query.bool.minimum_should_match' as {@link Integer}.
+ * The value is, e.g.
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + * @throws NumberFormatException When the property is not integer. + */ + Integer getQueryBoolMinimumShouldMatchAsInteger(); + /** * Get the value for the key 'query.prefix.expansions'.
* The value is, e.g. 50
@@ -9489,6 +9535,26 @@ public boolean isQueryBoostFuzzyContentTranspositions() { return is(FessConfig.QUERY_BOOST_FUZZY_CONTENT_TRANSPOSITIONS); } + public String getQueryDefaultQueryType() { + return get(FessConfig.QUERY_DEFAULT_query_type); + } + + public String getQueryDismaxTieBreaker() { + return get(FessConfig.QUERY_DISMAX_tie_breaker); + } + + public java.math.BigDecimal getQueryDismaxTieBreakerAsDecimal() { + return getAsDecimal(FessConfig.QUERY_DISMAX_tie_breaker); + } + + public String getQueryBoolMinimumShouldMatch() { + return get(FessConfig.QUERY_BOOL_minimum_should_match); + } + + public Integer getQueryBoolMinimumShouldMatchAsInteger() { + return getAsInteger(FessConfig.QUERY_BOOL_minimum_should_match); + } + public String getQueryPrefixExpansions() { return get(FessConfig.QUERY_PREFIX_EXPANSIONS); } @@ -11158,6 +11224,9 @@ protected java.util.Map prepareGeneratedDefaultMap() { defaultMap.put(FessConfig.QUERY_BOOST_FUZZY_CONTENT_EXPANSIONS, "10"); defaultMap.put(FessConfig.QUERY_BOOST_FUZZY_CONTENT_prefix_length, "0"); defaultMap.put(FessConfig.QUERY_BOOST_FUZZY_CONTENT_TRANSPOSITIONS, "true"); + defaultMap.put(FessConfig.QUERY_DEFAULT_query_type, "bool"); + defaultMap.put(FessConfig.QUERY_DISMAX_tie_breaker, "0.1"); + defaultMap.put(FessConfig.QUERY_BOOL_minimum_should_match, ""); defaultMap.put(FessConfig.QUERY_PREFIX_EXPANSIONS, "50"); defaultMap.put(FessConfig.QUERY_PREFIX_SLOP, "0"); defaultMap.put(FessConfig.QUERY_FUZZY_prefix_length, "0"); diff --git a/src/main/java/org/codelibs/fess/query/DefaultQueryBuilder.java b/src/main/java/org/codelibs/fess/query/DefaultQueryBuilder.java new file mode 100644 index 0000000000..b0682e2efc --- /dev/null +++ b/src/main/java/org/codelibs/fess/query/DefaultQueryBuilder.java @@ -0,0 +1,148 @@ +/* + * Copyright 2012-2024 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.query; + +import java.io.IOException; +import java.util.Objects; + +import org.apache.lucene.search.Query; +import org.opensearch.core.common.io.stream.StreamOutput; +import org.opensearch.core.xcontent.XContentBuilder; +import org.opensearch.index.query.BoolQueryBuilder; +import org.opensearch.index.query.DisMaxQueryBuilder; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryBuilderVisitor; +import org.opensearch.index.query.QueryRewriteContext; +import org.opensearch.index.query.QueryShardContext; + +public class DefaultQueryBuilder implements QueryBuilder { + + private final QueryBuilder queryBuilder; + + private final QueryType queryType; + + public DefaultQueryBuilder(final QueryBuilder queryBuilder) { + this.queryBuilder = queryBuilder; + if (queryBuilder instanceof BoolQueryBuilder) { + queryType = QueryType.BOOL; + } else if (queryBuilder instanceof DisMaxQueryBuilder) { + queryType = QueryType.DISMAX; + } else { + throw new IllegalArgumentException("Unknown query builder: " + queryBuilder); + } + } + + public DefaultQueryBuilder add(final QueryBuilder innerQueryBuilder) { + switch (queryType) { + case BOOL: + ((BoolQueryBuilder) queryBuilder).should(innerQueryBuilder); + break; + case DISMAX: + ((DisMaxQueryBuilder) queryBuilder).add(innerQueryBuilder); + break; + default: + break; + } + return this; + } + + enum QueryType { + BOOL, DISMAX; + } + + @Override + public String getWriteableName() { + return queryBuilder.getWriteableName(); + } + + @Override + public Query toQuery(final QueryShardContext context) throws IOException { + return queryBuilder.toQuery(context); + } + + @Override + public boolean isFragment() { + return queryBuilder.isFragment(); + } + + @Override + public QueryBuilder queryName(final String queryName) { + return queryBuilder.queryName(queryName); + } + + @Override + public String queryName() { + return queryBuilder.queryName(); + } + + @Override + public float boost() { + return queryBuilder.boost(); + } + + @Override + public QueryBuilder boost(final float boost) { + return queryBuilder.boost(boost); + } + + @Override + public String getName() { + return queryBuilder.getName(); + } + + @Override + public QueryBuilder rewrite(final QueryRewriteContext queryShardContext) throws IOException { + return queryBuilder.rewrite(queryShardContext); + } + + @Override + public void visit(final QueryBuilderVisitor visitor) { + queryBuilder.visit(visitor); + } + + @Override + public XContentBuilder toXContent(final XContentBuilder builder, final Params params) throws IOException { + return queryBuilder.toXContent(builder, params); + } + + @Override + public void writeTo(final StreamOutput out) throws IOException { + queryBuilder.writeTo(out); + } + + @Override + public int hashCode() { + return queryBuilder.hashCode(); + } + + @Override + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if ((obj == null) || (getClass() != obj.getClass())) { + return false; + } + final DefaultQueryBuilder other = (DefaultQueryBuilder) obj; + return Objects.equals(queryBuilder, other.queryBuilder); + } + + @Override + public String toString() { + return queryBuilder.toString(); + } + +} diff --git a/src/main/java/org/codelibs/fess/query/QueryCommand.java b/src/main/java/org/codelibs/fess/query/QueryCommand.java index f7ff145a52..6b70450c8e 100644 --- a/src/main/java/org/codelibs/fess/query/QueryCommand.java +++ b/src/main/java/org/codelibs/fess/query/QueryCommand.java @@ -20,6 +20,7 @@ import java.lang.Character.UnicodeBlock; import org.apache.lucene.search.Query; +import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.entity.QueryContext; import org.codelibs.fess.mylasta.direction.FessConfig; @@ -27,6 +28,7 @@ import org.dbflute.optional.OptionalThing; import org.lastaflute.web.util.LaRequestUtil; import org.opensearch.index.query.BoolQueryBuilder; +import org.opensearch.index.query.DisMaxQueryBuilder; import org.opensearch.index.query.QueryBuilder; import org.opensearch.index.query.QueryBuilders; import org.opensearch.search.sort.SortBuilder; @@ -72,30 +74,47 @@ protected OptionalThing getQueryLanguages() { (String[]) request.getAttribute(Constants.REQUEST_LANGUAGES))); } - protected BoolQueryBuilder buildDefaultQueryBuilder(final FessConfig fessConfig, final QueryContext context, + protected DefaultQueryBuilder buildDefaultQueryBuilder(final FessConfig fessConfig, final QueryContext context, final DefaultQueryBuilderFunction builder) { - final BoolQueryBuilder boolQuery = QueryBuilders.boolQuery(); - boolQuery.should(builder.apply(fessConfig.getIndexFieldTitle(), fessConfig.getQueryBoostTitleAsDecimal().floatValue())); - boolQuery.should(builder.apply(fessConfig.getIndexFieldContent(), fessConfig.getQueryBoostContentAsDecimal().floatValue())); + final DefaultQueryBuilder defaultQuery = createDefaultQueryBuilder(); + defaultQuery.add(builder.apply(fessConfig.getIndexFieldTitle(), fessConfig.getQueryBoostTitleAsDecimal().floatValue())); + defaultQuery.add(builder.apply(fessConfig.getIndexFieldContent(), fessConfig.getQueryBoostContentAsDecimal().floatValue())); final float importantContentBoost = fessConfig.getQueryBoostImportantContentAsDecimal().floatValue(); if (importantContentBoost >= 0.0f) { - boolQuery.should(builder.apply(fessConfig.getIndexFieldImportantContent(), importantContentBoost)); + defaultQuery.add(builder.apply(fessConfig.getIndexFieldImportantContent(), importantContentBoost)); } final float importantContantLangBoost = fessConfig.getQueryBoostImportantContentLangAsDecimal().floatValue(); getQueryLanguages().ifPresent(langs -> stream(langs).of(stream -> stream.forEach(lang -> { - boolQuery.should( + defaultQuery.add( builder.apply(fessConfig.getIndexFieldTitle() + "_" + lang, fessConfig.getQueryBoostTitleLangAsDecimal().floatValue())); - boolQuery.should(builder.apply(fessConfig.getIndexFieldContent() + "_" + lang, + defaultQuery.add(builder.apply(fessConfig.getIndexFieldContent() + "_" + lang, fessConfig.getQueryBoostContentLangAsDecimal().floatValue())); if (importantContantLangBoost >= 0.0f) { - boolQuery.should(builder.apply(fessConfig.getIndexFieldImportantContent() + "_" + lang, importantContantLangBoost)); + defaultQuery.add(builder.apply(fessConfig.getIndexFieldImportantContent() + "_" + lang, importantContantLangBoost)); } }))); getQueryFieldConfig().additionalDefaultList.stream().forEach(f -> { final QueryBuilder query = builder.apply(f.getFirst(), f.getSecond()); - boolQuery.should(query); + defaultQuery.add(query); }); - return boolQuery; + return defaultQuery; + } + + protected DefaultQueryBuilder createDefaultQueryBuilder() { + final FessConfig fessConfig = ComponentUtil.getFessConfig(); + + if ("dismax".equals(fessConfig.getQueryDefaultQueryType())) { + final DisMaxQueryBuilder disMaxQuery = QueryBuilders.disMaxQuery(); + disMaxQuery.tieBreaker(fessConfig.getQueryDismaxTieBreakerAsDecimal().floatValue()); + return new DefaultQueryBuilder(disMaxQuery); + } + + final BoolQueryBuilder boolQuery = QueryBuilders.boolQuery(); + final String minimumShouldMatch = fessConfig.getQueryBoolMinimumShouldMatch(); + if (StringUtil.isNotBlank(minimumShouldMatch)) { + boolQuery.minimumShouldMatch(minimumShouldMatch); + } + return new DefaultQueryBuilder(boolQuery); } protected QueryBuilder buildMatchPhraseQuery(final String f, final String text) { diff --git a/src/main/java/org/codelibs/fess/query/TermQueryCommand.java b/src/main/java/org/codelibs/fess/query/TermQueryCommand.java index 53641c4618..6eb86f157c 100644 --- a/src/main/java/org/codelibs/fess/query/TermQueryCommand.java +++ b/src/main/java/org/codelibs/fess/query/TermQueryCommand.java @@ -34,7 +34,6 @@ import org.codelibs.fess.util.ComponentUtil; import org.lastaflute.core.message.UserMessages; import org.opensearch.common.unit.Fuzziness; -import org.opensearch.index.query.BoolQueryBuilder; import org.opensearch.index.query.QueryBuilder; import org.opensearch.index.query.QueryBuilders; import org.opensearch.search.sort.SortOrder; @@ -161,24 +160,24 @@ protected QueryBuilder convertDefaultTermQuery(final FessConfig fessConfig, fina final float boost, final String field, final String text) { context.addFieldLog(field, text); context.addHighlightedQuery(text); - final BoolQueryBuilder boolQuery = + final DefaultQueryBuilder defaultQuery = buildDefaultQueryBuilder(fessConfig, context, (f, b) -> buildMatchPhraseQuery(f, text).boost(b * boost)); final Integer fuzzyMinLength = fessConfig.getQueryBoostFuzzyMinLengthAsInteger(); if (fuzzyMinLength >= 0 && text.length() >= fuzzyMinLength) { - boolQuery.should(QueryBuilders.fuzzyQuery(fessConfig.getIndexFieldTitle(), text) + defaultQuery.add(QueryBuilders.fuzzyQuery(fessConfig.getIndexFieldTitle(), text) .boost(fessConfig.getQueryBoostFuzzyTitleAsDecimal().floatValue()) .prefixLength(fessConfig.getQueryBoostFuzzyTitlePrefixLengthAsInteger()) .transpositions(Constants.TRUE.equalsIgnoreCase(fessConfig.getQueryBoostFuzzyTitleTranspositions())) .fuzziness(Fuzziness.build(fessConfig.getQueryBoostFuzzyTitleFuzziness())) .maxExpansions(fessConfig.getQueryBoostFuzzyTitleExpansionsAsInteger())); - boolQuery.should(QueryBuilders.fuzzyQuery(fessConfig.getIndexFieldContent(), text) + defaultQuery.add(QueryBuilders.fuzzyQuery(fessConfig.getIndexFieldContent(), text) .prefixLength(fessConfig.getQueryBoostFuzzyContentPrefixLengthAsInteger()) .transpositions(Constants.TRUE.equalsIgnoreCase(fessConfig.getQueryBoostFuzzyContentTranspositions())) .boost(fessConfig.getQueryBoostFuzzyContentAsDecimal().floatValue()) .fuzziness(Fuzziness.build(fessConfig.getQueryBoostFuzzyContentFuzziness())) .maxExpansions(fessConfig.getQueryBoostFuzzyContentExpansionsAsInteger())); } - return boolQuery; + return defaultQuery; } protected QueryBuilder convertSiteQuery(final FessConfig fessConfig, final QueryContext context, final TermQuery termQuery, diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties index 2060037d61..6afdce293d 100644 --- a/src/main/resources/fess_config.properties +++ b/src/main/resources/fess_config.properties @@ -570,6 +570,10 @@ query.boost.fuzzy.content.expansions=10 query.boost.fuzzy.content.prefix_length=0 query.boost.fuzzy.content.transpositions=true +query.default.query_type=bool +query.dismax.tie_breaker=0.1 +query.bool.minimum_should_match= + query.prefix.expansions=50 query.prefix.slop=0 query.fuzzy.prefix_length=0 diff --git a/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java b/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java index 2e586d6a01..0e1689e7fa 100644 --- a/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java @@ -16,6 +16,7 @@ package org.codelibs.fess.helper; import java.io.File; +import java.math.BigDecimal; import java.util.List; import java.util.Map; import java.util.Set; @@ -27,6 +28,7 @@ import org.codelibs.fess.entity.QueryContext; import org.codelibs.fess.entity.SearchRequestParams.SearchRequestType; import org.codelibs.fess.exception.InvalidQueryException; +import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.query.BooleanQueryCommand; import org.codelibs.fess.query.BoostQueryCommand; import org.codelibs.fess.query.FuzzyQueryCommand; @@ -41,6 +43,7 @@ import org.codelibs.fess.query.parser.QueryParser; import org.codelibs.fess.unit.UnitFessTestCase; import org.codelibs.fess.util.ComponentUtil; +import org.dbflute.util.DfTypeUtil; import org.opensearch.index.query.BoolQueryBuilder; import org.opensearch.index.query.QueryBuilder; import org.opensearch.index.query.QueryBuilders; @@ -88,7 +91,54 @@ protected QueryParser getQueryParser() { new WildcardQueryCommand().register(); } + private void setQueryType(final String queryType) { + final FessConfig fessConfig = ComponentUtil.getFessConfig(); + ComponentUtil.setFessConfig(new FessConfig.SimpleImpl() { + @Override + public String get(String propertyKey) { + return fessConfig.get(propertyKey); + } + + @Override + public BigDecimal getAsDecimal(String propertyKey) { + return DfTypeUtil.toBigDecimal(get(propertyKey)); + } + + @Override + public Integer getAsInteger(String propertyKey) { + return DfTypeUtil.toInteger(get(propertyKey)); + } + + @Override + public String getQueryDefaultQueryType() { + return queryType; + } + }); + } + public void test_build_simple() { + setQueryType("bool"); + + float titleBoost = 0.5f; + float contentBoost = 0.05f; + + assertQuery(functionScoreQuery(simpleQuery("QUERY", titleBoost, contentBoost)), // + Map.of("_default", List.of("QUERY")), // + Set.of("QUERY"), // + buildQuery("QUERY")); + assertQuery(functionScoreQuery(simpleQuery("QUERY", titleBoost, contentBoost)), // + Map.of("_default", List.of("QUERY")), // + Set.of("QUERY"), // + buildQuery(" QUERY")); + assertQuery(functionScoreQuery(simpleQuery("QUERY", titleBoost, contentBoost)), // + Map.of("_default", List.of("QUERY")), // + Set.of("QUERY"), // + buildQuery("QUERY ")); + } + + public void test_build_simple_dismax() { + setQueryType("dismax"); + float titleBoost = 0.5f; float contentBoost = 0.05f; @@ -133,6 +183,7 @@ public void test_build_multiple() { } public void test_build_boost() { + setQueryType("bool"); assertQueryContext( "{\"function_score\":{\"query\":{\"bool\":{\"should\":[{\"match_phrase\":{\"title\":{\"query\":\"QUERY1\",\"slop\":0,\"zero_terms_query\":\"NONE\",\"boost\":5.0}}},{\"match_phrase\":{\"content\":{\"query\":\"QUERY1\",\"slop\":0,\"zero_terms_query\":\"NONE\",\"boost\":0.5}}},{\"fuzzy\":{\"title\":{\"value\":\"QUERY1\",\"fuzziness\":\"AUTO\",\"prefix_length\":0,\"max_expansions\":10,\"transpositions\":true,\"boost\":0.01}}},{\"fuzzy\":{\"content\":{\"value\":\"QUERY1\",\"fuzziness\":\"AUTO\",\"prefix_length\":0,\"max_expansions\":10,\"transpositions\":true,\"boost\":0.005}}}],\"adjust_pure_negative\":true,\"boost\":1.0}},\"functions\":[{\"filter\":{\"match_all\":{\"boost\":1.0}},\"field_value_factor\":{\"field\":\"boost\",\"factor\":1.0,\"modifier\":\"none\"}}],\"score_mode\":\"multiply\",\"max_boost\":3.4028235E38,\"boost\":1.0}}", Map.of("_default", List.of("QUERY1")), // @@ -153,6 +204,7 @@ public void test_build_boost() { } public void test_build_wildcard() { + setQueryType("bool"); assertQueryContext( "{\"function_score\":{\"query\":{\"bool\":{\"should\":[{\"wildcard\":{\"title\":{\"wildcard\":\"*\",\"boost\":0.5}}},{\"wildcard\":{\"content\":{\"wildcard\":\"*\",\"boost\":0.05}}}],\"adjust_pure_negative\":true,\"boost\":1.0}},\"functions\":[{\"filter\":{\"match_all\":{\"boost\":1.0}},\"field_value_factor\":{\"field\":\"boost\",\"factor\":1.0,\"modifier\":\"none\"}}],\"score_mode\":\"multiply\",\"max_boost\":3.4028235E38,\"boost\":1.0}}", Map.of("_default", List.of("*")), // @@ -191,6 +243,7 @@ public void test_build_wildcard() { } public void test_build_phrase() { + setQueryType("bool"); assertQueryContext( "{\"function_score\":{\"query\":{\"bool\":{\"should\":[{\"match_phrase\":{\"title\":{\"query\":\"QUERY1QUERY2\",\"slop\":0,\"zero_terms_query\":\"NONE\",\"boost\":0.5}}},{\"match_phrase\":{\"content\":{\"query\":\"QUERY1QUERY2\",\"slop\":0,\"zero_terms_query\":\"NONE\",\"boost\":0.05}}}],\"adjust_pure_negative\":true,\"boost\":1.0}},\"functions\":[{\"filter\":{\"match_all\":{\"boost\":1.0}},\"field_value_factor\":{\"field\":\"boost\",\"factor\":1.0,\"modifier\":\"none\"}}],\"score_mode\":\"multiply\",\"max_boost\":3.4028235E38,\"boost\":1.0}}", Map.of("_default", List.of("QUERY1 QUERY2")), // @@ -207,6 +260,7 @@ public void test_build_phrase() { } public void test_build_prefix() { + setQueryType("bool"); assertQueryContext( "{\"function_score\":{\"query\":{\"bool\":{\"should\":[{\"match_phrase_prefix\":{\"title\":{\"query\":\"query\",\"slop\":0,\"max_expansions\":50,\"zero_terms_query\":\"NONE\",\"boost\":0.5}}},{\"match_phrase_prefix\":{\"content\":{\"query\":\"query\",\"slop\":0,\"max_expansions\":50,\"zero_terms_query\":\"NONE\",\"boost\":0.05}}}],\"adjust_pure_negative\":true,\"boost\":1.0}},\"functions\":[{\"filter\":{\"match_all\":{\"boost\":1.0}},\"field_value_factor\":{\"field\":\"boost\",\"factor\":1.0,\"modifier\":\"none\"}}],\"score_mode\":\"multiply\",\"max_boost\":3.4028235E38,\"boost\":1.0}}", Map.of("_default", List.of("QUERY*")), // @@ -229,6 +283,7 @@ public void test_build_prefix() { } public void test_build_escape() { + setQueryType("bool"); assertQueryContext( "{\"function_score\":{\"query\":{\"bool\":{\"should\":[{\"match_phrase\":{\"title\":{\"query\":\"aaa:bbb\",\"slop\":0,\"zero_terms_query\":\"NONE\",\"boost\":0.5}}},{\"match_phrase\":{\"content\":{\"query\":\"aaa:bbb\",\"slop\":0,\"zero_terms_query\":\"NONE\",\"boost\":0.05}}},{\"fuzzy\":{\"title\":{\"value\":\"aaa:bbb\",\"fuzziness\":\"AUTO\",\"prefix_length\":0,\"max_expansions\":10,\"transpositions\":true,\"boost\":0.01}}},{\"fuzzy\":{\"content\":{\"value\":\"aaa:bbb\",\"fuzziness\":\"AUTO\",\"prefix_length\":0,\"max_expansions\":10,\"transpositions\":true,\"boost\":0.005}}}],\"adjust_pure_negative\":true,\"boost\":1.0}},\"functions\":[{\"filter\":{\"match_all\":{\"boost\":1.0}},\"field_value_factor\":{\"field\":\"boost\",\"factor\":1.0,\"modifier\":\"none\"}}],\"score_mode\":\"multiply\",\"max_boost\":3.4028235E38,\"boost\":1.0}}", Map.of("_default", List.of("aaa:bbb")), // @@ -335,6 +390,7 @@ public void test_build_sort() { } public void test_build_fuzzy() { + setQueryType("bool"); assertQueryContext( "{\"function_score\":{\"query\":{\"bool\":{\"should\":[{\"fuzzy\":{\"title\":{\"value\":\"QUERY1\",\"fuzziness\":\"2\",\"prefix_length\":0,\"max_expansions\":50,\"transpositions\":true,\"boost\":0.5}}},{\"fuzzy\":{\"content\":{\"value\":\"QUERY1\",\"fuzziness\":\"2\",\"prefix_length\":0,\"max_expansions\":50,\"transpositions\":true,\"boost\":0.05}}}],\"adjust_pure_negative\":true,\"boost\":1.0}},\"functions\":[{\"filter\":{\"match_all\":{\"boost\":1.0}},\"field_value_factor\":{\"field\":\"boost\",\"factor\":1.0,\"modifier\":\"none\"}}],\"score_mode\":\"multiply\",\"max_boost\":3.4028235E38,\"boost\":1.0}}", Map.of("_default", List.of("QUERY1")), // @@ -357,6 +413,7 @@ public void test_build_fuzzy() { } public void test_build_range() { + setQueryType("bool"); assertQueryContext( "{\"function_score\":{\"query\":{\"bool\":{\"should\":[{\"match_phrase\":{\"title\":{\"query\":\"[aaaTObbb]\",\"slop\":0,\"zero_terms_query\":\"NONE\",\"boost\":0.5}}},{\"match_phrase\":{\"content\":{\"query\":\"[aaaTObbb]\",\"slop\":0,\"zero_terms_query\":\"NONE\",\"boost\":0.05}}}],\"adjust_pure_negative\":true,\"boost\":1.0}},\"functions\":[{\"filter\":{\"match_all\":{\"boost\":1.0}},\"field_value_factor\":{\"field\":\"boost\",\"factor\":1.0,\"modifier\":\"none\"}}],\"score_mode\":\"multiply\",\"max_boost\":3.4028235E38,\"boost\":1.0}}", Map.of("_default", List.of("[aaa TO bbb]")), // @@ -439,6 +496,14 @@ private QueryBuilder orQuery(QueryBuilder... queries) { } private QueryBuilder simpleQuery(String query, float titleBoost, float contentBoost) { + if ("dismax".equals(ComponentUtil.getFessConfig().getQueryDefaultQueryType())) { + return QueryBuilders.disMaxQuery().tieBreaker(0.1f)// + .add(QueryBuilders.matchPhraseQuery("title", query).boost(titleBoost))// + .add(QueryBuilders.matchPhraseQuery("content", query).boost(contentBoost))// + .add(QueryBuilders.fuzzyQuery("title", query).boost(0.01f).maxExpansions(10))// + .add(QueryBuilders.fuzzyQuery("content", query).boost(0.005f).maxExpansions(10))// + ; + } return QueryBuilders.boolQuery()// .should(QueryBuilders.matchPhraseQuery("title", query).boost(titleBoost))// .should(QueryBuilders.matchPhraseQuery("content", query).boost(contentBoost))// diff --git a/src/test/java/org/codelibs/fess/query/DefaultQueryBuilderTest.java b/src/test/java/org/codelibs/fess/query/DefaultQueryBuilderTest.java new file mode 100644 index 0000000000..5662b16b80 --- /dev/null +++ b/src/test/java/org/codelibs/fess/query/DefaultQueryBuilderTest.java @@ -0,0 +1,39 @@ +/* + * Copyright 2012-2024 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.query; + +import org.codelibs.fess.unit.UnitFessTestCase; +import org.opensearch.index.query.QueryBuilders; + +public class DefaultQueryBuilderTest extends UnitFessTestCase { + public void test_invalid_null() { + try { + new DefaultQueryBuilder(null); + fail(); + } catch (IllegalArgumentException e) { + // nothing + } + } + + public void test_invalid_query() { + try { + new DefaultQueryBuilder(QueryBuilders.matchAllQuery()); + fail(); + } catch (IllegalArgumentException e) { + // nothing + } + } +} diff --git a/src/test/java/org/codelibs/fess/query/TermQueryCommandTest.java b/src/test/java/org/codelibs/fess/query/TermQueryCommandTest.java index a99cfc9c30..11d50be655 100644 --- a/src/test/java/org/codelibs/fess/query/TermQueryCommandTest.java +++ b/src/test/java/org/codelibs/fess/query/TermQueryCommandTest.java @@ -15,6 +15,7 @@ */ package org.codelibs.fess.query; +import java.math.BigDecimal; import java.util.List; import org.apache.logging.log4j.LogManager; @@ -23,9 +24,11 @@ import org.apache.lucene.search.TermQuery; import org.codelibs.fess.entity.QueryContext; import org.codelibs.fess.exception.InvalidQueryException; +import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.query.parser.QueryParser; import org.codelibs.fess.unit.UnitFessTestCase; import org.codelibs.fess.util.ComponentUtil; +import org.dbflute.util.DfTypeUtil; import org.opensearch.index.query.BoolQueryBuilder; import org.opensearch.index.query.MatchPhraseQueryBuilder; import org.opensearch.index.query.PrefixQueryBuilder; @@ -60,8 +63,34 @@ public void tearDown() throws Exception { super.tearDown(); } + private void setQueryType(final String queryType) { + final FessConfig fessConfig = ComponentUtil.getFessConfig(); + ComponentUtil.setFessConfig(new FessConfig.SimpleImpl() { + @Override + public String get(String propertyKey) { + return fessConfig.get(propertyKey); + } + + @Override + public BigDecimal getAsDecimal(String propertyKey) { + return DfTypeUtil.toBigDecimal(get(propertyKey)); + } + + @Override + public Integer getAsInteger(String propertyKey) { + return DfTypeUtil.toInteger(get(propertyKey)); + } + + @Override + public String getQueryDefaultQueryType() { + return queryType; + } + }); + } + public void test_convertTermQuery() throws Exception { - assertQueryBuilder(BoolQueryBuilder.class, + setQueryType("bool"); + assertQueryBuilder(DefaultQueryBuilder.class, "{\"bool\":{\"should\":[{\"match_phrase\":{\"title\":{\"query\":\"aaa\",\"slop\":0,\"zero_terms_query\":\"NONE\",\"boost\":0.5}}},{\"match_phrase\":{\"content\":{\"query\":\"aaa\",\"slop\":0,\"zero_terms_query\":\"NONE\",\"boost\":0.05}}}],\"adjust_pure_negative\":true,\"boost\":1.0}}", "aaa"); assertQueryBuilder(MatchPhraseQueryBuilder.class, @@ -70,7 +99,7 @@ public void test_convertTermQuery() throws Exception { assertQueryBuilder(MatchPhraseQueryBuilder.class, "{\"match_phrase\":{\"content\":{\"query\":\"aaa\",\"slop\":0,\"zero_terms_query\":\"NONE\",\"boost\":1.0}}}", // "content:aaa"); - assertQueryBuilder(BoolQueryBuilder.class, + assertQueryBuilder(DefaultQueryBuilder.class, "{\"bool\":{\"should\":[{\"match_phrase\":{\"title\":{\"query\":\"xxx:aaa\",\"slop\":0,\"zero_terms_query\":\"NONE\",\"boost\":0.5}}},{\"match_phrase\":{\"content\":{\"query\":\"xxx:aaa\",\"slop\":0,\"zero_terms_query\":\"NONE\",\"boost\":0.05}}},{\"fuzzy\":{\"title\":{\"value\":\"xxx:aaa\",\"fuzziness\":\"AUTO\",\"prefix_length\":0,\"max_expansions\":10,\"transpositions\":true,\"boost\":0.01}}},{\"fuzzy\":{\"content\":{\"value\":\"xxx:aaa\",\"fuzziness\":\"AUTO\",\"prefix_length\":0,\"max_expansions\":10,\"transpositions\":true,\"boost\":0.005}}}],\"adjust_pure_negative\":true,\"boost\":1.0}}", "xxx:aaa"); assertQueryBuilder(WildcardQueryBuilder.class, // @@ -95,6 +124,42 @@ public void test_convertTermQuery() throws Exception { } } + public void test_convertTermQuery_dismax() throws Exception { + setQueryType("dismax"); + assertQueryBuilder(DefaultQueryBuilder.class, + "{\"dis_max\":{\"tie_breaker\":0.1,\"queries\":[{\"match_phrase\":{\"title\":{\"query\":\"aaa\",\"slop\":0,\"zero_terms_query\":\"NONE\",\"boost\":0.5}}},{\"match_phrase\":{\"content\":{\"query\":\"aaa\",\"slop\":0,\"zero_terms_query\":\"NONE\",\"boost\":0.05}}}],\"boost\":1.0}}", + "aaa"); + assertQueryBuilder(MatchPhraseQueryBuilder.class, + "{\"match_phrase\":{\"title\":{\"query\":\"aaa\",\"slop\":0,\"zero_terms_query\":\"NONE\",\"boost\":1.0}}}", // + "title:aaa"); + assertQueryBuilder(MatchPhraseQueryBuilder.class, + "{\"match_phrase\":{\"content\":{\"query\":\"aaa\",\"slop\":0,\"zero_terms_query\":\"NONE\",\"boost\":1.0}}}", // + "content:aaa"); + assertQueryBuilder(DefaultQueryBuilder.class, + "{\"dis_max\":{\"tie_breaker\":0.1,\"queries\":[{\"match_phrase\":{\"title\":{\"query\":\"xxx:aaa\",\"slop\":0,\"zero_terms_query\":\"NONE\",\"boost\":0.5}}},{\"match_phrase\":{\"content\":{\"query\":\"xxx:aaa\",\"slop\":0,\"zero_terms_query\":\"NONE\",\"boost\":0.05}}},{\"fuzzy\":{\"title\":{\"value\":\"xxx:aaa\",\"fuzziness\":\"AUTO\",\"prefix_length\":0,\"max_expansions\":10,\"transpositions\":true,\"boost\":0.01}}},{\"fuzzy\":{\"content\":{\"value\":\"xxx:aaa\",\"fuzziness\":\"AUTO\",\"prefix_length\":0,\"max_expansions\":10,\"transpositions\":true,\"boost\":0.005}}}],\"boost\":1.0}}", + "xxx:aaa"); + assertQueryBuilder(WildcardQueryBuilder.class, // + "{\"wildcard\":{\"url\":{\"wildcard\":\"*aaa*\",\"boost\":1.0}}}", // + "inurl:aaa"); + assertQueryBuilder(TermQueryBuilder.class, // + "{\"term\":{\"url\":{\"value\":\"aaa\",\"boost\":1.0}}}", // + "url:aaa"); + assertQueryBuilder(PrefixQueryBuilder.class, // + "{\"prefix\":{\"site\":{\"value\":\"aaa\",\"boost\":1.0}}}", // + "site:aaa"); + + assertQueryBuilder("{\"timestamp\":{\"order\":\"asc\"}}", "sort:timestamp"); + assertQueryBuilder("{\"timestamp\":{\"order\":\"asc\"}}", "sort:timestamp.asc"); + assertQueryBuilder("{\"timestamp\":{\"order\":\"desc\"}}", "sort:timestamp.desc"); + + try { + assertQueryBuilder("", "sort:xxx"); + fail(); + } catch (InvalidQueryException e) { + // nothing + } + } + private void assertQueryBuilder(final String expect, final String text) throws Exception { QueryContext queryContext = assertQueryBuilder(null, null, text); List> sortBuilders = queryContext.sortBuilders(); From 9e78a39cc1bfaefcf440ddcc53cceb11cf625ba8 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Mon, 15 Jul 2024 16:35:47 +0900 Subject: [PATCH 47/69] fix #2829 Enable specifying RankFusionSearcher via system properties configuration. --- .../codelibs/fess/helper/SystemHelper.java | 2 + .../fess/rank/fusion/RankFusionProcessor.java | 65 +++++++++++++++---- 2 files changed, 55 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java index 532af0f612..70026fc36c 100644 --- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java @@ -517,6 +517,8 @@ public void reloadConfiguration(final boolean resetJobs) { ComponentUtil.getJobManager().reboot(); } updateSystemProperties(); + + ComponentUtil.getRankFusionProcessor().update(); } public void updateSystemProperties() { diff --git a/src/main/java/org/codelibs/fess/rank/fusion/RankFusionProcessor.java b/src/main/java/org/codelibs/fess/rank/fusion/RankFusionProcessor.java index 3b745baec4..32be2e30f0 100644 --- a/src/main/java/org/codelibs/fess/rank/fusion/RankFusionProcessor.java +++ b/src/main/java/org/codelibs/fess/rank/fusion/RankFusionProcessor.java @@ -17,6 +17,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -28,11 +29,15 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.search.TotalHits.Relation; import org.codelibs.core.collection.ArrayUtil; +import org.codelibs.core.concurrent.CommonPoolUtil; +import org.codelibs.core.lang.StringUtil; +import org.codelibs.core.stream.StreamUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.entity.FacetInfo; import org.codelibs.fess.entity.GeoInfo; @@ -65,6 +70,8 @@ public class RankFusionProcessor implements AutoCloseable { protected int windowSize; + protected Set availableSearcherNameSet; + @PostConstruct public void init() { final FessConfig fessConfig = ComponentUtil.getFessConfig(); @@ -77,6 +84,24 @@ public void init() { } else { this.windowSize = windowSize; } + load(); + } + + public void update() { + CommonPoolUtil.execute(this::load); + } + + protected void load() { + final String value = System.getProperty("rank.fusion.searchers"); + if (StringUtil.isBlank(value)) { + availableSearcherNameSet = Collections.emptySet(); + } else { + availableSearcherNameSet = StreamUtil.split(value, ",") + .get(stream -> stream.map(String::trim).filter(StringUtil::isNotBlank).collect(Collectors.toUnmodifiableSet())); + } + if (logger.isDebugEnabled()) { + logger.debug("availableSearcherNameSet={}", availableSearcherNameSet); + } } @Override @@ -98,14 +123,30 @@ public void close() throws Exception { public List> search(final String query, final SearchRequestParams params, final OptionalThing userBean) { - if (searchers.length == 1) { - return searchWithMainSearcher(query, params, userBean); + final RankFusionSearcher[] availableSearchers = getAvailableSearchers(); + if (availableSearchers.length == 1) { + return searchWithMainSearcher(availableSearchers[0], query, params, userBean); } - return searchWithMultipleSearchers(query, params, userBean); + return searchWithMultipleSearchers(availableSearchers, query, params, userBean); } - protected List> searchWithMultipleSearchers(final String query, final SearchRequestParams params, - final OptionalThing userBean) { + protected RankFusionSearcher[] getAvailableSearchers() { + if (availableSearcherNameSet.isEmpty()) { + return searchers; + } + final RankFusionSearcher[] availableSearchers = Arrays.stream(searchers) + .filter(searcher -> availableSearcherNameSet.contains(searcher.getName())).toArray(n -> new RankFusionSearcher[n]); + if (availableSearchers.length == 0) { + if (logger.isDebugEnabled()) { + logger.debug("No available searchers from {}", availableSearcherNameSet); + } + return new RankFusionSearcher[] { searchers[0] }; + } + return availableSearchers; + } + + protected List> searchWithMultipleSearchers(final RankFusionSearcher[] searchers, final String query, + final SearchRequestParams params, final OptionalThing userBean) { if (logger.isDebugEnabled()) { logger.debug("Send {} to the searchers.", query); } @@ -192,13 +233,13 @@ protected List> searchWithMultipleSearchers(final String que final Map baseDoc = scoreDocMap.get(id); final float oldScore = toFloat(baseDoc.get(scoreField)); baseDoc.put(scoreField, oldScore + score); - final String[] searchers = DocumentUtil.getValue(doc, Constants.SEARCHER, String[].class); - if (searchers != null) { + final String[] searcherNames = DocumentUtil.getValue(doc, Constants.SEARCHER, String[].class); + if (searcherNames != null) { final String[] baseSearchers = DocumentUtil.getValue(baseDoc, Constants.SEARCHER, String[].class); if (baseSearchers != null) { - baseDoc.put(Constants.SEARCHER, ArrayUtil.addAll(baseSearchers, searchers)); + baseDoc.put(Constants.SEARCHER, ArrayUtil.addAll(baseSearchers, searcherNames)); } else { - baseDoc.put(Constants.SEARCHER, searchers); + baseDoc.put(Constants.SEARCHER, searcherNames); } } } else { @@ -248,13 +289,13 @@ protected List> extractList(final List> return docs.subList(fromIndex, toIndex); } - protected List> searchWithMainSearcher(final String query, final SearchRequestParams params, - final OptionalThing userBean) { + protected List> searchWithMainSearcher(final RankFusionSearcher searcher, final String query, + final SearchRequestParams params, final OptionalThing userBean) { if (logger.isDebugEnabled()) { logger.debug("Send {} to the main searcher.", query); } final int pageSize = params.getPageSize(); - final SearchResult searchResult = searchers[0].search(query, params, userBean); + final SearchResult searchResult = searcher.search(query, params, userBean); return createResponseList(searchResult.getDocumentList(), searchResult.getAllRecordCount(), searchResult.getAllRecordCountRelation(), searchResult.getQueryTime(), searchResult.isPartialResults(), searchResult.getFacetResponse(), params.getStartPosition(), pageSize, 0); From a7d00092fb1eb8934c76e922e5e88ff0c40a0838 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Mon, 22 Jul 2024 11:07:22 +0900 Subject: [PATCH 48/69] fix #2830 Add batch_size parameter to search log and click log processing. --- .../codelibs/fess/helper/SearchLogHelper.java | 24 ++++++++++++++--- .../fess/mylasta/direction/FessConfig.java | 27 +++++++++++++++++++ src/main/resources/fess_config.properties | 1 + 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java index 42b18207f0..2897272c16 100644 --- a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java @@ -341,9 +341,17 @@ protected void processUserInfoLog(final List searchLogList, final Map protected void storeSearchLogList(final List searchLogList) { final SearchLogBhv searchLogBhv = ComponentUtil.getComponent(SearchLogBhv.class); - searchLogBhv.batchUpdate(searchLogList, op -> { - op.setRefreshPolicy(Constants.TRUE); - }); + final int batchSize = ComponentUtil.getFessConfig().getSearchlogProcessBatchSizeAsInteger(); + final int totalSize = searchLogList.size(); + for (int i = 0; i < totalSize; i += batchSize) { + final int end = Math.min(totalSize, i + batchSize); + if (logger.isDebugEnabled()) { + logger.debug("Sending {} search logs. ({}-{}/{})", end - i, i, end, totalSize); + } + searchLogBhv.batchUpdate(searchLogList.subList(i, end), op -> { + op.setRefreshPolicy(Constants.TRUE); + }); + } } protected void processClickLogQueue(final Queue queue) { @@ -416,7 +424,15 @@ protected void processClickLog(final List clickLogList) { final FessConfig fessConfig = ComponentUtil.getFessConfig(); try { final ClickLogBhv clickLogBhv = ComponentUtil.getComponent(ClickLogBhv.class); - clickLogBhv.batchInsert(clickLogList); + final int batchSize = fessConfig.getSearchlogProcessBatchSizeAsInteger(); + final int totalSize = clickLogList.size(); + for (int i = 0; i < totalSize; i += batchSize) { + final int end = Math.min(totalSize, i + batchSize); + if (logger.isDebugEnabled()) { + logger.debug("Sending {} click logs. ({}-{}/{})", end - i, i, end, totalSize); + } + clickLogBhv.batchInsert(clickLogList.subList(i, end)); + } } catch (final Exception e) { logger.warn("Failed to insert: {}", clickLogList, e); } 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 92b6452fdc..0537be6299 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java @@ -1365,6 +1365,9 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** The key of the configuration. e.g. */ String SEARCHLOG_REQUEST_HEADERS = "searchlog.request.headers"; + /** The key of the configuration. e.g. 100 */ + String SEARCHLOG_PROCESS_batch_size = "searchlog.process.batch_size"; + /** The key of the configuration. e.g. 100 */ String THUMBNAIL_HTML_IMAGE_MIN_WIDTH = "thumbnail.html.image.min.width"; @@ -6367,6 +6370,21 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction */ Integer getSearchlogRequestHeadersAsInteger(); + /** + * Get the value for the key 'searchlog.process.batch_size'.
+ * The value is, e.g. 100
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getSearchlogProcessBatchSize(); + + /** + * Get the value for the key 'searchlog.process.batch_size' as {@link Integer}.
+ * The value is, e.g. 100
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + * @throws NumberFormatException When the property is not integer. + */ + Integer getSearchlogProcessBatchSizeAsInteger(); + /** * Get the value for the key 'thumbnail.html.image.min.width'.
* The value is, e.g. 100
@@ -10127,6 +10145,14 @@ public Integer getSearchlogRequestHeadersAsInteger() { return getAsInteger(FessConfig.SEARCHLOG_REQUEST_HEADERS); } + public String getSearchlogProcessBatchSize() { + return get(FessConfig.SEARCHLOG_PROCESS_batch_size); + } + + public Integer getSearchlogProcessBatchSizeAsInteger() { + return getAsInteger(FessConfig.SEARCHLOG_PROCESS_batch_size); + } + public String getThumbnailHtmlImageMinWidth() { return get(FessConfig.THUMBNAIL_HTML_IMAGE_MIN_WIDTH); } @@ -11311,6 +11337,7 @@ protected java.util.Map prepareGeneratedDefaultMap() { defaultMap.put(FessConfig.PAGING_SEARCH_PAGE_MAX_SIZE, "100"); defaultMap.put(FessConfig.SEARCHLOG_AGG_SHARD_SIZE, "-1"); defaultMap.put(FessConfig.SEARCHLOG_REQUEST_HEADERS, ""); + defaultMap.put(FessConfig.SEARCHLOG_PROCESS_batch_size, "100"); defaultMap.put(FessConfig.THUMBNAIL_HTML_IMAGE_MIN_WIDTH, "100"); defaultMap.put(FessConfig.THUMBNAIL_HTML_IMAGE_MIN_HEIGHT, "100"); defaultMap.put(FessConfig.THUMBNAIL_HTML_IMAGE_MAX_ASPECT_RATIO, "3.0"); diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties index 6afdce293d..5c3471d4c9 100644 --- a/src/main/resources/fess_config.properties +++ b/src/main/resources/fess_config.properties @@ -720,6 +720,7 @@ paging.search.page.max.size=100 searchlog.agg.shard.size=-1 searchlog.request.headers= +searchlog.process.batch_size=100 thumbnail.html.image.min.width=100 thumbnail.html.image.min.height=100 From e0f2314c75561a64064c2023a0890eb6414feaa9 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Mon, 22 Jul 2024 13:30:29 +0900 Subject: [PATCH 49/69] fix #2831 Include score in the search API response fields. --- src/main/java/org/codelibs/fess/query/QueryFieldConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/codelibs/fess/query/QueryFieldConfig.java b/src/main/java/org/codelibs/fess/query/QueryFieldConfig.java index b5dc1111db..5d813c7f96 100644 --- a/src/main/java/org/codelibs/fess/query/QueryFieldConfig.java +++ b/src/main/java/org/codelibs/fess/query/QueryFieldConfig.java @@ -202,6 +202,7 @@ public void init() { } if (apiResponseFieldSet == null) { setApiResponseFields(fessConfig.getQueryAdditionalApiResponseFields(// + SCORE_SORT_VALUE, // fessConfig.getResponseFieldContentDescription(), // fessConfig.getResponseFieldContentTitle(), // fessConfig.getResponseFieldSitePath(), // From 9de34ffd1a68404f32678c144ee0c2a0bacc4f00 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Mon, 22 Jul 2024 15:09:52 +0900 Subject: [PATCH 50/69] fix #2832 Auto-switch search operator to OR when hit count is below threshold --- .../java/org/codelibs/fess/Constants.java | 2 ++ .../codelibs/fess/helper/SearchHelper.java | 18 ++++++++++++- .../fess/mylasta/direction/FessConfig.java | 27 +++++++++++++++++++ .../fess/query/parser/QueryParser.java | 11 +++++++- src/main/resources/fess_config.properties | 1 + 5 files changed, 57 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/codelibs/fess/Constants.java b/src/main/java/org/codelibs/fess/Constants.java index 09abe30646..c459248e6d 100644 --- a/src/main/java/org/codelibs/fess/Constants.java +++ b/src/main/java/org/codelibs/fess/Constants.java @@ -250,6 +250,8 @@ public class Constants extends CoreLibConstants { public static final Pattern LUCENE_RANGE_FIELD_RESERVED_PATTERN = Pattern.compile("([!\\(\\){}\\[\\]\"~\\\\:\\p{Zs}]|(&&)|(\\|\\|))"); + public static final String DEFAULT_QUERY_OPERATOR = "fess.DefaultQueryOperator"; + public static final String SEARCH_LOG_ACCESS_TYPE = "searchLogAccessType"; public static final String SEARCH_LOG_ACCESS_TYPE_JSON = "json"; diff --git a/src/main/java/org/codelibs/fess/helper/SearchHelper.java b/src/main/java/org/codelibs/fess/helper/SearchHelper.java index f2cf74ed7f..bce4c786ac 100644 --- a/src/main/java/org/codelibs/fess/helper/SearchHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SearchHelper.java @@ -43,6 +43,7 @@ import org.codelibs.fess.mylasta.action.FessUserBean; import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.query.QueryFieldConfig; +import org.codelibs.fess.rank.fusion.RankFusionProcessor; import org.codelibs.fess.util.BooleanFunction; import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.util.QueryResponseList; @@ -160,7 +161,22 @@ public void search(final SearchRequestParams params, final SearchRenderData data protected List> searchInternal(final String query, final SearchRequestParams params, final OptionalThing userBean) { - return ComponentUtil.getRankFusionProcessor().search(query, params, userBean); + final RankFusionProcessor rankFusionProcessor = ComponentUtil.getRankFusionProcessor(); + final List> documentItems = rankFusionProcessor.search(query, params, userBean); + if (documentItems instanceof QueryResponseList queryResponseList) { + final FessConfig fessConfig = ComponentUtil.getFessConfig(); + if (queryResponseList.getAllRecordCount() <= fessConfig.getQueryOrsearchMinHitCountAsInteger()) { + return LaRequestUtil.getOptionalRequest().map(request -> { + request.setAttribute(Constants.DEFAULT_QUERY_OPERATOR, "OR"); + if (logger.isDebugEnabled()) { + logger.debug("The number of hits is {}<={}. Searching again with OR operator.", + queryResponseList.getAllRecordCount(), fessConfig.getQueryOrsearchMinHitCountAsInteger()); + } + return rankFusionProcessor.search(query, params, userBean); + }).orElse(queryResponseList); + } + } + return documentItems; } public long scrollSearch(final SearchRequestParams params, final BooleanFunction> cursor, 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 0537be6299..7646ea337c 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java @@ -856,6 +856,9 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** The key of the configuration. e.g. true */ String QUERY_REPLACE_TERM_WITH_PREFIX_QUERY = "query.replace.term.with.prefix.query"; + /** The key of the configuration. e.g. 0 */ + String QUERY_ORSEARCH_MIN_HIT_COUNT = "query.orsearch.min.hit.count"; + /** The key of the configuration. e.g. u0021u002Cu002Eu003Fu0589u061Fu06D4u0700u0701u0702u0964u104Au104Bu1362u1367u1368u166Eu1803u1809u203Cu203Du2047u2048u2049u3002uFE52uFE57uFF01uFF0EuFF1FuFF61 */ String QUERY_HIGHLIGHT_TERMINAL_CHARS = "query.highlight.terminal.chars"; @@ -4400,6 +4403,21 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction */ boolean isQueryReplaceTermWithPrefixQuery(); + /** + * Get the value for the key 'query.orsearch.min.hit.count'.
+ * The value is, e.g. 0
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getQueryOrsearchMinHitCount(); + + /** + * Get the value for the key 'query.orsearch.min.hit.count' as {@link Integer}.
+ * The value is, e.g. 0
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + * @throws NumberFormatException When the property is not integer. + */ + Integer getQueryOrsearchMinHitCountAsInteger(); + /** * Get the value for the key 'query.highlight.terminal.chars'.
* The value is, e.g. u0021u002Cu002Eu003Fu0589u061Fu06D4u0700u0701u0702u0964u104Au104Bu1362u1367u1368u166Eu1803u1809u203Cu203Du2047u2048u2049u3002uFE52uFE57uFF01uFF0EuFF1FuFF61
@@ -9121,6 +9139,14 @@ public boolean isQueryReplaceTermWithPrefixQuery() { return is(FessConfig.QUERY_REPLACE_TERM_WITH_PREFIX_QUERY); } + public String getQueryOrsearchMinHitCount() { + return get(FessConfig.QUERY_ORSEARCH_MIN_HIT_COUNT); + } + + public Integer getQueryOrsearchMinHitCountAsInteger() { + return getAsInteger(FessConfig.QUERY_ORSEARCH_MIN_HIT_COUNT); + } + public String getQueryHighlightTerminalChars() { return get(FessConfig.QUERY_HIGHLIGHT_TERMINAL_CHARS); } @@ -11183,6 +11209,7 @@ protected java.util.Map prepareGeneratedDefaultMap() { 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_ORSEARCH_MIN_HIT_COUNT, "0"); defaultMap.put(FessConfig.QUERY_HIGHLIGHT_TERMINAL_CHARS, "u0021u002Cu002Eu003Fu0589u061Fu06D4u0700u0701u0702u0964u104Au104Bu1362u1367u1368u166Eu1803u1809u203Cu203Du2047u2048u2049u3002uFE52uFE57uFF01uFF0EuFF1FuFF61"); defaultMap.put(FessConfig.QUERY_HIGHLIGHT_FRAGMENT_SIZE, "60"); diff --git a/src/main/java/org/codelibs/fess/query/parser/QueryParser.java b/src/main/java/org/codelibs/fess/query/parser/QueryParser.java index ca1b68b852..a8a274260b 100644 --- a/src/main/java/org/codelibs/fess/query/parser/QueryParser.java +++ b/src/main/java/org/codelibs/fess/query/parser/QueryParser.java @@ -29,6 +29,7 @@ import org.apache.lucene.search.TermQuery; import org.codelibs.fess.Constants; import org.codelibs.fess.exception.QueryParseException; +import org.lastaflute.web.util.LaRequestUtil; import jakarta.annotation.PostConstruct; @@ -58,7 +59,15 @@ public Query parse(final String query) { protected org.apache.lucene.queryparser.classic.QueryParser createQueryParser() { final LuceneQueryParser parser = new LuceneQueryParser(defaultField, analyzer); parser.setAllowLeadingWildcard(allowLeadingWildcard); - parser.setDefaultOperator(defaultOperator); + LaRequestUtil.getOptionalRequest().ifPresent(req -> { + if (req.getAttribute(Constants.DEFAULT_QUERY_OPERATOR) instanceof String op) { + parser.setDefaultOperator(Operator.valueOf(op)); + } else { + parser.setDefaultOperator(defaultOperator); + } + }).orElse(() -> { + parser.setDefaultOperator(defaultOperator); + }); return parser; } diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties index 5c3471d4c9..b537c01c23 100644 --- a/src/main/resources/fess_config.properties +++ b/src/main/resources/fess_config.properties @@ -443,6 +443,7 @@ query.track.total.hits=10000 query.geo.fields=location query.browser.lang.parameter.name=browser_lang query.replace.term.with.prefix.query=true +query.orsearch.min.hit.count=0 query.highlight.terminal.chars=u0021u002Cu002Eu003Fu0589u061Fu06D4u0700u0701u0702u0964u104Au104Bu1362u1367u1368u166Eu1803u1809u203Cu203Du2047u2048u2049u3002uFE52uFE57uFF01uFF0EuFF1FuFF61 query.highlight.fragment.size=60 query.highlight.number.of.fragments=2 From aff1dd0fcd22f679bf9c87d65cfb2ced1c81b650 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Mon, 22 Jul 2024 15:56:21 +0900 Subject: [PATCH 51/69] #2831 Ensure score is finite before adding to API response in SearchHelper and DefaultSearcher. --- src/main/java/org/codelibs/fess/helper/SearchHelper.java | 5 ++++- .../java/org/codelibs/fess/rank/fusion/DefaultSearcher.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/codelibs/fess/helper/SearchHelper.java b/src/main/java/org/codelibs/fess/helper/SearchHelper.java index bce4c786ac..c640f77831 100644 --- a/src/main/java/org/codelibs/fess/helper/SearchHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SearchHelper.java @@ -217,7 +217,10 @@ public long scrollSearch(final SearchRequestParams params, final BooleanFunction } if (!docMap.containsKey(Constants.SCORE)) { - docMap.put(Constants.SCORE, hit.getScore()); + final float score = hit.getScore(); + if (Float.isFinite(score)) { + docMap.put(Constants.SCORE, score); + } } docMap.put(fessConfig.getIndexFieldId(), hit.getId()); diff --git a/src/main/java/org/codelibs/fess/rank/fusion/DefaultSearcher.java b/src/main/java/org/codelibs/fess/rank/fusion/DefaultSearcher.java index 5a6c938161..35eb3f145f 100644 --- a/src/main/java/org/codelibs/fess/rank/fusion/DefaultSearcher.java +++ b/src/main/java/org/codelibs/fess/rank/fusion/DefaultSearcher.java @@ -184,7 +184,10 @@ protected Map parseSearchHit(final FessConfig fessConfig, final } if (!docMap.containsKey(Constants.SCORE)) { - docMap.put(Constants.SCORE, searchHit.getScore()); + final float score = searchHit.getScore(); + if (Float.isFinite(score)) { + docMap.put(Constants.SCORE, score); + } } if (!docMap.containsKey(fessConfig.getIndexFieldId())) { From 6885cbdc9107763e7d165668bb4cfbf19f36103a Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Wed, 24 Jul 2024 17:54:24 +0900 Subject: [PATCH 52/69] fix #2833 Add bulk document indexing API to Admin API --- .../searchlist/AdminSearchlistAction.java | 34 +++--- .../codelibs/fess/app/web/api/ApiResult.java | 16 ++- .../documents/ApiAdminDocumentsAction.java | 110 ++++++++++++++++++ .../app/web/api/admin/documents/BulkBody.java | 25 ++++ .../searchlist/ApiAdminSearchlistAction.java | 4 +- .../fess/es/client/SearchEngineClient.java | 26 +---- .../codelibs/fess/helper/IndexingHelper.java | 29 ++++- .../fess/mylasta/direction/FessProp.java | 76 +++++++++--- .../fess/helper/IndexingHelperTest.java | 6 +- 9 files changed, 258 insertions(+), 68 deletions(-) create mode 100644 src/main/java/org/codelibs/fess/app/web/api/admin/documents/ApiAdminDocumentsAction.java create mode 100644 src/main/java/org/codelibs/fess/app/web/api/admin/documents/BulkBody.java 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 94507978b4..17579abb09 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 @@ -271,7 +271,7 @@ public HtmlResponse edit(final EditForm form) { public HtmlResponse create(final CreateForm form) { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, this::asEditHtml); - validateFields(form, v -> throwValidationError(v, this::asEditHtml)); + validateFields(form.doc, v -> throwValidationError(v, this::asEditHtml)); verifyToken(this::asEditHtml); getDoc(form).ifPresent(entity -> { try { @@ -299,7 +299,7 @@ public HtmlResponse create(final CreateForm form) { public HtmlResponse update(final EditForm form) { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, this::asEditHtml); - validateFields(form, v -> throwValidationError(v, this::asEditHtml)); + validateFields(form.doc, v -> throwValidationError(v, this::asEditHtml)); verifyToken(this::asEditHtml); getDoc(form).ifPresent(entity -> { final String index = fessConfig.getIndexDocumentUpdateIndex(); @@ -334,37 +334,37 @@ public HtmlResponse update(final EditForm form) { // =================================================================================== // Validation // ========= - public static void validateFields(final CreateForm form, final Consumer> throwError) { + public static void validateFields(final Map doc, final Consumer> throwError) { final FessConfig fessConfig = ComponentUtil.getFessConfig(); try { - if (!fessConfig.validateIndexRequiredFields(form.doc)) { - throwError.accept(messages -> fessConfig.invalidIndexRequiredFields(form.doc).stream().map(s -> "doc." + s) + if (!fessConfig.validateIndexRequiredFields(doc)) { + throwError.accept(messages -> fessConfig.invalidIndexRequiredFields(doc).stream().map(s -> "doc." + s) .forEach(s -> messages.addErrorsPropertyRequired(s, s))); } - if (!fessConfig.validateIndexArrayFields(form.doc)) { - throwError.accept(messages -> fessConfig.invalidIndexArrayFields(form.doc).stream().map(s -> "doc." + s) + if (!fessConfig.validateIndexArrayFields(doc)) { + throwError.accept(messages -> fessConfig.invalidIndexArrayFields(doc).stream().map(s -> "doc." + s) .forEach(s -> messages.addErrorsPropertyRequired(s, s))); } - if (!fessConfig.validateIndexDateFields(form.doc)) { - throwError.accept(messages -> fessConfig.invalidIndexDateFields(form.doc).stream().map(s -> "doc." + s) + if (!fessConfig.validateIndexDateFields(doc)) { + throwError.accept(messages -> fessConfig.invalidIndexDateFields(doc).stream().map(s -> "doc." + s) .forEach(s -> messages.addErrorsPropertyTypeDate(s, s))); } - if (!fessConfig.validateIndexIntegerFields(form.doc)) { - throwError.accept(messages -> fessConfig.invalidIndexIntegerFields(form.doc).stream().map(s -> "doc." + s) + if (!fessConfig.validateIndexIntegerFields(doc)) { + throwError.accept(messages -> fessConfig.invalidIndexIntegerFields(doc).stream().map(s -> "doc." + s) .forEach(s -> messages.addErrorsPropertyTypeInteger(s, s))); } - if (!fessConfig.validateIndexLongFields(form.doc)) { - throwError.accept(messages -> fessConfig.invalidIndexLongFields(form.doc).stream().map(s -> "doc." + s) + if (!fessConfig.validateIndexLongFields(doc)) { + throwError.accept(messages -> fessConfig.invalidIndexLongFields(doc).stream().map(s -> "doc." + s) .forEach(s -> messages.addErrorsPropertyTypeLong(s, s))); } - if (!fessConfig.validateIndexFloatFields(form.doc)) { - throwError.accept(messages -> fessConfig.invalidIndexFloatFields(form.doc).stream().map(s -> "doc." + s) + if (!fessConfig.validateIndexFloatFields(doc)) { + throwError.accept(messages -> fessConfig.invalidIndexFloatFields(doc).stream().map(s -> "doc." + s) .forEach(s -> messages.addErrorsPropertyTypeFloat(s, s))); } - if (!fessConfig.validateIndexDoubleFields(form.doc)) { - throwError.accept(messages -> fessConfig.invalidIndexDoubleFields(form.doc).stream().map(s -> "doc." + s) + if (!fessConfig.validateIndexDoubleFields(doc)) { + throwError.accept(messages -> fessConfig.invalidIndexDoubleFields(doc).stream().map(s -> "doc." + s) .forEach(s -> messages.addErrorsPropertyTypeDouble(s, s))); } } catch (final Exception e) { 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 2d6145f823..c665692368 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 @@ -39,7 +39,7 @@ public ApiResult(final ApiResponse response) { } public enum Status { - OK(0), BAD_REQUEST(1), SYSTEM_ERROR(2), UNAUTHORIZED(3); + OK(0), BAD_REQUEST(1), SYSTEM_ERROR(2), UNAUTHORIZED(3), FAILED(9); private final int id; @@ -391,4 +391,18 @@ public ApiResult result() { return new ApiResult(this); } } + + public static class ApiBulkResponse extends ApiResponse { + protected List> items; + + public ApiBulkResponse items(final List> items) { + this.items = items; + return this; + } + + @Override + public ApiResult result() { + return new ApiResult(this); + } + } } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/documents/ApiAdminDocumentsAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/documents/ApiAdminDocumentsAction.java new file mode 100644 index 0000000000..7a890c7816 --- /dev/null +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/documents/ApiAdminDocumentsAction.java @@ -0,0 +1,110 @@ +/* + * Copyright 2012-2024 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.app.web.api.admin.documents; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.codelibs.fess.app.web.admin.searchlist.AdminSearchlistAction; +import org.codelibs.fess.app.web.api.ApiResult; +import org.codelibs.fess.app.web.api.ApiResult.ApiBulkResponse; +import org.codelibs.fess.app.web.api.ApiResult.Status; +import org.codelibs.fess.app.web.api.admin.FessApiAdminAction; +import org.codelibs.fess.app.web.api.admin.searchlist.ApiAdminSearchlistAction; +import org.codelibs.fess.es.client.SearchEngineClient; +import org.codelibs.fess.helper.CrawlingConfigHelper; +import org.codelibs.fess.helper.CrawlingInfoHelper; +import org.codelibs.fess.thumbnail.ThumbnailManager; +import org.codelibs.fess.util.ComponentUtil; +import org.lastaflute.web.Execute; +import org.lastaflute.web.response.JsonResponse; +import org.opensearch.action.bulk.BulkResponse; + +import jakarta.annotation.Resource; + +public class ApiAdminDocumentsAction extends FessApiAdminAction { + // =================================================================================== + // Constant + // + private static final Logger logger = LogManager.getLogger(ApiAdminSearchlistAction.class); + + // =================================================================================== + // Attribute + // ========= + @Resource + protected SearchEngineClient searchEngineClient; + + // =================================================================================== + // Search Execute + // + + // POST /api/admin/documents/bulk + @Execute + public JsonResponse post$bulk(final BulkBody body) { + validateApi(body, messages -> {}); + if (body.documents == null) { + throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, "documents is required.")); + } + if (body.documents.isEmpty()) { + throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, "documents is empty.")); + } + final String indexFieldId = fessConfig.getIndexFieldId(); + final CrawlingInfoHelper crawlingInfoHelper = ComponentUtil.getCrawlingInfoHelper(); + final List> docList = body.documents.stream().map(doc -> { + AdminSearchlistAction.validateFields(doc, this::throwValidationErrorApi); + final Map newDoc = fessConfig.convertToStorableDoc(doc); + final String newId = crawlingInfoHelper.generateId(newDoc); + newDoc.put(indexFieldId, newId); + return newDoc; + }).toList(); + if (fessConfig.isThumbnailCrawlerEnabled()) { + final ThumbnailManager thumbnailManager = ComponentUtil.getThumbnailManager(); + final String thumbnailField = fessConfig.getIndexFieldThumbnail(); + docList.stream().forEach(doc -> { + if (!thumbnailManager.offer(doc)) { + if (logger.isDebugEnabled()) { + logger.debug("Removing {}={} from doc[{}]", thumbnailField, doc.get(thumbnailField), + doc.get(fessConfig.getIndexFieldUrl())); + } + doc.remove(thumbnailField); + } + }); + } + + final CrawlingConfigHelper crawlingConfigHelper = ComponentUtil.getCrawlingConfigHelper(); + final BulkResponse response = searchEngineClient.addAll(fessConfig.getIndexDocumentUpdateIndex(), docList, (doc, builder) -> { + if (doc.get(fessConfig.getIndexFieldConfigId()) instanceof final String configId) { + crawlingConfigHelper.getPipeline(configId).ifPresent(s -> builder.setPipeline(s)); + } + }); + return asJson(new ApiBulkResponse().items(Arrays.stream(response.getItems()).map(item -> { + final Map itemMap = new HashMap<>(); + itemMap.put("status", item.status().name()); + if (item.isFailed()) { + itemMap.put("message", item.getFailureMessage()); + } else { + itemMap.put("id", item.getId()); + } + return itemMap; + }).toList()).status(response.hasFailures() ? Status.FAILED : Status.OK).result()); + + } + +} diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/documents/BulkBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/documents/BulkBody.java new file mode 100644 index 0000000000..a67199fd39 --- /dev/null +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/documents/BulkBody.java @@ -0,0 +1,25 @@ +/* + * Copyright 2012-2024 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.app.web.api.admin.documents; + +import java.util.List; +import java.util.Map; + +public class BulkBody { + + public List> documents; + +} 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 114f44b825..1017d911ff 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 @@ -120,7 +120,7 @@ public JsonResponse docs(final SearchBody body) { if (body.doc == null) { throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, "doc is required")); } - validateFields(body, this::throwValidationErrorApi); + validateFields(body.doc, this::throwValidationErrorApi); body.crudMode = CrudMode.CREATE; final Map doc = getDoc(body).map(entity -> { try { @@ -152,7 +152,7 @@ public JsonResponse docs(final SearchBody body) { if (body.doc == null) { throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, "doc is required")); } - validateFields(body, this::throwValidationErrorApi); + validateFields(body.doc, this::throwValidationErrorApi); body.crudMode = CrudMode.EDIT; final Map doc = getDoc(body).map(entity -> { final String index = fessConfig.getIndexDocumentUpdateIndex(); diff --git a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java b/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java index 186c491afa..84f484b6a1 100644 --- a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java +++ b/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java @@ -84,7 +84,6 @@ import org.opensearch.OpenSearchStatusException; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionType; -import org.opensearch.action.DocWriteRequest; import org.opensearch.action.DocWriteRequest.OpType; import org.opensearch.action.DocWriteResponse.Result; import org.opensearch.action.admin.cluster.health.ClusterHealthResponse; @@ -97,8 +96,6 @@ import org.opensearch.action.admin.indices.refresh.RefreshResponse; import org.opensearch.action.admin.indices.segments.IndicesSegmentResponse; import org.opensearch.action.admin.indices.segments.PitSegmentsRequest; -import org.opensearch.action.bulk.BulkItemResponse; -import org.opensearch.action.bulk.BulkItemResponse.Failure; import org.opensearch.action.bulk.BulkRequest; import org.opensearch.action.bulk.BulkRequestBuilder; import org.opensearch.action.bulk.BulkResponse; @@ -1186,7 +1183,7 @@ public PingResponse ping() { } } - public String[] addAll(final String index, final List> docList, + public BulkResponse addAll(final String index, final List> docList, final BiConsumer, IndexRequestBuilder> options) { final FessConfig fessConfig = ComponentUtil.getFessConfig(); final BulkRequestBuilder bulkRequestBuilder = client.prepareBulk(); @@ -1196,26 +1193,7 @@ public String[] addAll(final String index, final List> docLi options.accept(doc, builder); bulkRequestBuilder.add(builder); } - final BulkResponse response = bulkRequestBuilder.execute().actionGet(ComponentUtil.getFessConfig().getIndexBulkTimeout()); - if (response.hasFailures()) { - if (logger.isDebugEnabled()) { - final List> requests = bulkRequestBuilder.request().requests(); - final BulkItemResponse[] items = response.getItems(); - if (requests.size() == items.length) { - for (int i = 0; i < requests.size(); i++) { - final BulkItemResponse resp = items[i]; - if (resp.isFailed() && resp.getFailure() != null) { - final DocWriteRequest req = requests.get(i); - final Failure failure = resp.getFailure(); - logger.debug("Failed Request: {}\n=>{}", req, failure.getMessage()); - } - } - } - } - throw new SearchEngineClientException(response.buildFailureMessage()); - } - - return Arrays.stream(response.getItems()).map(BulkItemResponse::getId).toArray(n -> new String[n]); + return bulkRequestBuilder.execute().actionGet(ComponentUtil.getFessConfig().getIndexBulkTimeout()); } public static class SearchConditionBuilder { diff --git a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java index 141ce4c81c..368abe5201 100644 --- a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java +++ b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java @@ -23,12 +23,16 @@ import org.apache.logging.log4j.Logger; import org.apache.lucene.search.TotalHits; import org.codelibs.fess.es.client.SearchEngineClient; +import org.codelibs.fess.es.client.SearchEngineClientException; import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.thumbnail.ThumbnailManager; import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.util.DocList; import org.codelibs.fess.util.MemoryUtil; import org.opensearch.action.admin.indices.refresh.RefreshResponse; +import org.opensearch.action.bulk.BulkItemResponse; +import org.opensearch.action.bulk.BulkItemResponse.Failure; +import org.opensearch.action.bulk.BulkResponse; import org.opensearch.action.search.SearchResponse; import org.opensearch.index.query.QueryBuilder; import org.opensearch.index.query.QueryBuilders; @@ -72,10 +76,27 @@ public void sendDocuments(final SearchEngineClient searchEngineClient, final Doc if (logger.isDebugEnabled()) { logger.debug("Deleted {} old docs", deletedDocCount); } - searchEngineClient.addAll(fessConfig.getIndexDocumentUpdateIndex(), docList, (doc, builder) -> { - final String configId = (String) doc.get(fessConfig.getIndexFieldConfigId()); - crawlingConfigHelper.getPipeline(configId).ifPresent(s -> builder.setPipeline(s)); - }); + final BulkResponse response = + searchEngineClient.addAll(fessConfig.getIndexDocumentUpdateIndex(), docList, (doc, builder) -> { + final String configId = (String) doc.get(fessConfig.getIndexFieldConfigId()); + crawlingConfigHelper.getPipeline(configId).ifPresent(s -> builder.setPipeline(s)); + }); + if (response.hasFailures()) { + if (logger.isDebugEnabled()) { + final BulkItemResponse[] items = response.getItems(); + if (docList.size() == items.length) { + for (int i = 0; i < docList.size(); i++) { + final BulkItemResponse resp = items[i]; + if (resp.isFailed() && resp.getFailure() != null) { + final Map req = docList.get(i); + final Failure failure = resp.getFailure(); + logger.debug("Failed Request: {}\n=>{}", req, failure.getMessage()); + } + } + } + } + throw new SearchEngineClientException(response.buildFailureMessage()); + } } if (logger.isInfoEnabled()) { if (docList.getContentSize() > 0) { 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 70ff5c94f9..e108c23a0d 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java @@ -1362,9 +1362,14 @@ default boolean validateIndexIntegerFields(final Map source) { default List invalidIndexIntegerFields(final Map source) { final IntegerTypeValidator integerValidator = new IntegerTypeValidator(); - 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())); + return split(getIndexAdminIntegerFields(), ",").get( + stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).filter(s -> isNonEmptyValue(source.get(s))).filter(s -> { + final Object obj = source.get(s); + if (obj instanceof Number) { + return false; + } + return !integerValidator.isValid(obj.toString(), null); + }).collect(Collectors.toList())); } String getIndexAdminLongFields(); @@ -1386,9 +1391,14 @@ default boolean validateIndexLongFields(final Map source) { default List invalidIndexLongFields(final Map source) { final LongTypeValidator longValidator = new LongTypeValidator(); - 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())); + return split(getIndexAdminLongFields(), ",").get( + stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).filter(s -> isNonEmptyValue(source.get(s))).filter(s -> { + final Object obj = source.get(s); + if (obj instanceof Number) { + return false; + } + return !longValidator.isValid(obj.toString(), null); + }).collect(Collectors.toList())); } String getIndexAdminFloatFields(); @@ -1410,9 +1420,13 @@ default boolean validateIndexFloatFields(final Map source) { default List invalidIndexFloatFields(final Map source) { final FloatTypeValidator floatValidator = new FloatTypeValidator(); - 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())); + return split(getIndexAdminFloatFields(), ",").get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).filter(s -> { + final Object obj = source.get(s); + if (obj instanceof Number) { + return false; + } + return !floatValidator.isValid(obj.toString(), null); + }).collect(Collectors.toList())); } String getIndexAdminDoubleFields(); @@ -1434,9 +1448,13 @@ default boolean validateIndexDoubleFields(final Map source) { default List invalidIndexDoubleFields(final Map source) { final DoubleTypeValidator doubleValidator = new DoubleTypeValidator(); - 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())); + return split(getIndexAdminDoubleFields(), ",").get(stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).filter(s -> { + final Object obj = source.get(s); + if (obj instanceof Number) { + return false; + } + return !doubleValidator.isValid(obj.toString(), null); + }).collect(Collectors.toList())); } default Map convertToEditableDoc(final Map source) { @@ -1488,19 +1506,41 @@ default Map convertToStorableDoc(final Map sourc 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())); + if (value instanceof String[]) { + value = Arrays.stream((String[]) value).toList(); + } else if (value instanceof List) { + // nothing + } else { + 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()); + if (value instanceof Number num) { + value = num.intValue(); + } else { + value = DfTypeUtil.toInteger(value.toString()); + } } else if (longFieldSet.contains(key)) { - value = DfTypeUtil.toLong(value.toString()); + if (value instanceof Number num) { + value = num.longValue(); + } else { + value = DfTypeUtil.toLong(value.toString()); + } } else if (floatFieldSet.contains(key)) { - value = DfTypeUtil.toFloat(value.toString()); + if (value instanceof Number num) { + value = num.floatValue(); + } else { + value = DfTypeUtil.toFloat(value.toString()); + } } else if (doubleFieldSet.contains(key)) { - value = DfTypeUtil.toDouble(value.toString()); + if (value instanceof Number num) { + value = num.doubleValue(); + } else { + value = DfTypeUtil.toDouble(value.toString()); + } } return new Pair<>(key, value); }).collect(Collectors.toMap(Pair::getFirst, Pair::getSecond)); diff --git a/src/test/java/org/codelibs/fess/helper/IndexingHelperTest.java b/src/test/java/org/codelibs/fess/helper/IndexingHelperTest.java index de9143e595..1e7efd1d5c 100644 --- a/src/test/java/org/codelibs/fess/helper/IndexingHelperTest.java +++ b/src/test/java/org/codelibs/fess/helper/IndexingHelperTest.java @@ -33,6 +33,8 @@ import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.util.DocList; import org.dbflute.optional.OptionalEntity; +import org.opensearch.action.bulk.BulkItemResponse; +import org.opensearch.action.bulk.BulkResponse; import org.opensearch.action.index.IndexAction; import org.opensearch.action.index.IndexRequestBuilder; import org.opensearch.action.search.SearchAction; @@ -87,12 +89,12 @@ public void test_sendDocuments() { final List> sentDocList = new ArrayList<>(); final SearchEngineClient client = new SearchEngineClient() { @Override - public String[] addAll(final String index, final List> docList, + public BulkResponse addAll(final String index, final List> docList, final BiConsumer, IndexRequestBuilder> options) { sentIndex.set(index); docList.forEach(x -> options.accept(x, new IndexRequestBuilder(this, IndexAction.INSTANCE))); sentDocList.addAll(docList); - return docList.stream().map(x -> (String) x.get("id")).toArray(n -> new String[n]); + return new BulkResponse(new BulkItemResponse[0], documentSizeByQuery); } @Override From 09fb29ef57c2b010fec5786014fe039c243ce8fd Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 25 Jul 2024 10:47:59 +0900 Subject: [PATCH 53/69] fix #2834 Added language detection and default value settings to bulk document indexing in Admin API. --- .../documents/ApiAdminDocumentsAction.java | 56 ++++++++++++++++++- .../codelibs/fess/helper/RoleQueryHelper.java | 2 +- .../fess/mylasta/direction/FessProp.java | 25 ++++++--- 3 files changed, 71 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/documents/ApiAdminDocumentsAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/documents/ApiAdminDocumentsAction.java index 7a890c7816..dbeb18b07e 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/documents/ApiAdminDocumentsAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/documents/ApiAdminDocumentsAction.java @@ -16,6 +16,7 @@ package org.codelibs.fess.app.web.api.admin.documents; import java.util.Arrays; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,6 +32,7 @@ import org.codelibs.fess.es.client.SearchEngineClient; import org.codelibs.fess.helper.CrawlingConfigHelper; import org.codelibs.fess.helper.CrawlingInfoHelper; +import org.codelibs.fess.helper.LanguageHelper; import org.codelibs.fess.thumbnail.ThumbnailManager; import org.codelibs.fess.util.ComponentUtil; import org.lastaflute.web.Execute; @@ -66,12 +68,60 @@ public class ApiAdminDocumentsAction extends FessApiAdminAction { throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, "documents is empty.")); } final String indexFieldId = fessConfig.getIndexFieldId(); + final String indexFieldDocId = fessConfig.getIndexFieldDocId(); + final String indexFieldContentLength = fessConfig.getIndexFieldContentLength(); + final String indexFieldTitle = fessConfig.getIndexFieldTitle(); + final String indexFieldContent = fessConfig.getIndexFieldContent(); + final String indexFieldFavoriteCount = fessConfig.getIndexFieldFavoriteCount(); + final String indexFieldClickCount = fessConfig.getIndexFieldClickCount(); + final String indexFieldBoost = fessConfig.getIndexFieldBoost(); + final String indexFieldRole = fessConfig.getIndexFieldRole(); + final String indexFieldLastModified = fessConfig.getIndexFieldLastModified(); + final String indexFieldTimestamp = fessConfig.getIndexFieldTimestamp(); + final String indexFieldLang = fessConfig.getIndexFieldLang(); + final List guestRoleList = fessConfig.getSearchGuestRoleList(); + final Date now = systemHelper.getCurrentTime(); final CrawlingInfoHelper crawlingInfoHelper = ComponentUtil.getCrawlingInfoHelper(); + final LanguageHelper languageHelper = ComponentUtil.getLanguageHelper(); final List> docList = body.documents.stream().map(doc -> { + if (!doc.containsKey(indexFieldContentLength)) { + long contentLength = 0; + if (doc.get(indexFieldTitle) instanceof final String title) { + contentLength += title.length(); + } + if (doc.get(indexFieldContent) instanceof final String content) { + contentLength += content.length(); + } + doc.put(indexFieldContentLength, contentLength); + } + if (!doc.containsKey(indexFieldFavoriteCount)) { + doc.put(indexFieldFavoriteCount, 0L); + } + if (!doc.containsKey(indexFieldClickCount)) { + doc.put(indexFieldClickCount, 0L); + } + if (!doc.containsKey(indexFieldBoost)) { + doc.put(indexFieldBoost, 1.0f); + } + if (!doc.containsKey(indexFieldRole)) { + doc.put(indexFieldRole, guestRoleList); + } + if (!doc.containsKey(indexFieldLastModified)) { + doc.put(indexFieldLastModified, now); + } + if (!doc.containsKey(indexFieldTimestamp)) { + doc.put(indexFieldTimestamp, now); + } AdminSearchlistAction.validateFields(doc, this::throwValidationErrorApi); final Map newDoc = fessConfig.convertToStorableDoc(doc); - final String newId = crawlingInfoHelper.generateId(newDoc); - newDoc.put(indexFieldId, newId); + newDoc.put(indexFieldId, crawlingInfoHelper.generateId(newDoc)); + newDoc.put(indexFieldDocId, systemHelper.generateDocId(newDoc)); + if (newDoc.get(indexFieldLang) instanceof final List langList) { + if (langList.contains("auto")) { + newDoc.remove(indexFieldLang); + } + languageHelper.updateDocument(newDoc); + } return newDoc; }).toList(); if (fessConfig.isThumbnailCrawlerEnabled()) { @@ -96,7 +146,7 @@ public class ApiAdminDocumentsAction extends FessApiAdminAction { }); return asJson(new ApiBulkResponse().items(Arrays.stream(response.getItems()).map(item -> { final Map itemMap = new HashMap<>(); - itemMap.put("status", item.status().name()); + itemMap.put("result", item.status().name()); if (item.isFailed()) { itemMap.put("message", item.getFailureMessage()); } else { diff --git a/src/main/java/org/codelibs/fess/helper/RoleQueryHelper.java b/src/main/java/org/codelibs/fess/helper/RoleQueryHelper.java index 81c82744de..045e3b4c8d 100644 --- a/src/main/java/org/codelibs/fess/helper/RoleQueryHelper.java +++ b/src/main/java/org/codelibs/fess/helper/RoleQueryHelper.java @@ -135,7 +135,7 @@ public Set build(final SearchRequestType searchRequestType) { throw new InvalidAccessTokenException("invalid_token", "Access token is requried."); } if (!hasAccessToken || roleSet.isEmpty()) { - roleSet.addAll(fessConfig.getSearchGuestPermissionList()); + roleSet.addAll(fessConfig.getSearchGuestRoleList()); } }); } catch (final RuntimeException e) { 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 e108c23a0d..1a741a69fe 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java @@ -132,7 +132,7 @@ public interface FessProp { String AUTHENTICATION_ADMIN_ROLES = "authenticationAdminRoles"; - String SEARCH_GUEST_PERMISSION_LIST = "searchGuestPermissionList"; + String SEARCH_GUEST_ROLE_LIST = "searchGuestPermissionList"; String SUGGEST_SEARCH_LOG_PERMISSIONS = "suggestSearchLogPermissions"; @@ -1276,15 +1276,15 @@ default boolean isValidSearchLogPermissions(final String[] permissions) { String getRoleSearchGuestPermissions(); - default List getSearchGuestPermissionList() { + default List getSearchGuestRoleList() { @SuppressWarnings("unchecked") - List list = (List) propMap.get(SEARCH_GUEST_PERMISSION_LIST); + List list = (List) propMap.get(SEARCH_GUEST_ROLE_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.add(getRoleSearchUserPrefix() + Constants.GUEST_USER); - propMap.put(SEARCH_GUEST_PERMISSION_LIST, list); + propMap.put(SEARCH_GUEST_ROLE_LIST, list); } return list; } @@ -1331,9 +1331,14 @@ default boolean validateIndexDateFields(final Map source) { } default List invalidIndexDateFields(final Map source) { - 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())); + return split(getIndexAdminDateFields(), ",").get( + stream -> stream.filter(StringUtil::isNotBlank).map(String::trim).filter(s -> isNonEmptyValue(source.get(s))).filter(s -> { + final Object obj = source.get(s); + if (obj instanceof Date) { + return false; + } + return !validateDateTimeString(source.get(s)); + }).collect(Collectors.toList())); } default boolean validateDateTimeString(final Object obj) { @@ -1516,7 +1521,11 @@ default Map convertToStorableDoc(final Map sourc } } else if (dateFieldSet.contains(key)) { // TODO time zone - value = FessFunctions.parseDate(value.toString()); + if (value instanceof Date) { + // nothing + } else { + value = FessFunctions.parseDate(value.toString()); + } } else if (integerFieldSet.contains(key)) { if (value instanceof Number num) { value = num.intValue(); From 8c48ac1f8a1b6ea50f2f2fa120dd891e18e708c8 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Fri, 26 Jul 2024 14:40:28 +0900 Subject: [PATCH 54/69] fix #2835 Add interface for rewriting search request parameters before processing --- .../codelibs/fess/helper/SearchHelper.java | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/codelibs/fess/helper/SearchHelper.java b/src/main/java/org/codelibs/fess/helper/SearchHelper.java index c640f77831..b46437129a 100644 --- a/src/main/java/org/codelibs/fess/helper/SearchHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SearchHelper.java @@ -16,6 +16,7 @@ package org.codelibs.fess.helper; import java.text.NumberFormat; +import java.util.Arrays; import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; @@ -72,15 +73,24 @@ public class SearchHelper { private static final Logger logger = LogManager.getLogger(SearchHelper.class); + // =================================================================================== + // Variable + // + + protected SearchRequestParamsRewriter[] searchRequestParamsRewriters = new SearchRequestParamsRewriter[0]; + // =================================================================================== // Method // ============== - public void search(final SearchRequestParams params, final SearchRenderData data, final OptionalThing userBean) { + public void search(final SearchRequestParams searchRequestParams, final SearchRenderData data, + final OptionalThing userBean) { final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); final long startTime = systemHelper.getCurrentTimeAsLong(); final long requestedTime = startTime; + final SearchRequestParams params = rewrite(searchRequestParams); + LaRequestUtil.getOptionalRequest().ifPresent(request -> { request.setAttribute(Constants.REQUEST_LANGUAGES, params.getLanguages()); request.setAttribute(Constants.REQUEST_QUERIES, params.getQuery()); @@ -354,4 +364,21 @@ public boolean bulkUpdate(final Consumer consumer) { throw new SearchEngineClientException("Failed to update bulk data.", e); } } + + protected SearchRequestParams rewrite(final SearchRequestParams params) { + SearchRequestParams newParams = params; + for (final SearchRequestParamsRewriter rewriter : searchRequestParamsRewriters) { + newParams = rewriter.rewrite(newParams); + } + return newParams; + } + + public void addRewriter(final SearchRequestParamsRewriter rewriter) { + searchRequestParamsRewriters = Arrays.copyOf(searchRequestParamsRewriters, searchRequestParamsRewriters.length + 1); + searchRequestParamsRewriters[searchRequestParamsRewriters.length - 1] = rewriter; + } + + public interface SearchRequestParamsRewriter { + SearchRequestParams rewrite(SearchRequestParams params); + } } From e55ecd72fe805b737e209502ec5d30821d638e46 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Sun, 28 Jul 2024 18:03:48 +0900 Subject: [PATCH 55/69] fix #2837 Removed scriptlet usage in Admin Design page for better code maintainability. --- .../web/admin/design/AdminDesignAction.java | 22 ++++++++-- src/main/resources/fess.xml | 4 -- .../webapp/WEB-INF/view/error/badRequest.jsp | 4 +- src/main/webapp/WEB-INF/view/error/error.jsp | 2 +- .../webapp/WEB-INF/view/error/notFound.jsp | 2 +- src/main/webapp/WEB-INF/view/error/system.jsp | 4 +- .../admin/design/AdminDesignActionTest.java | 42 +++++++++++++++++++ 7 files changed, 67 insertions(+), 13 deletions(-) create mode 100644 src/test/java/org/codelibs/fess/app/web/admin/design/AdminDesignActionTest.java diff --git a/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java b/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java index 05177e8184..2a6e171954 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; +import java.util.regex.Pattern; import org.apache.commons.io.FileUtils; import org.apache.logging.log4j.LogManager; @@ -47,6 +48,10 @@ */ public class AdminDesignAction extends FessAdminAction { + private static final String CACHE_AND_SESSION_INVALIDATE_STATEMENT = ""; + + private static final String TRY_STATEMENT = ""; + public static final String ROLE = "admin-design"; private static final Logger logger = LogManager.getLogger(AdminDesignAction.class); @@ -237,7 +242,7 @@ public HtmlResponse edit(final EditForm form) { final String jspType = "view"; final File jspFile = getJspFile(form.fileName, jspType); try { - form.content = new String(FileUtil.readBytes(jspFile), Constants.UTF_8); + form.content = encodeJsp(new String(FileUtil.readBytes(jspFile), Constants.UTF_8)); } catch (final UnsupportedEncodingException e) { throw new FessSystemException("Invalid encoding", e); } @@ -251,7 +256,7 @@ public HtmlResponse editAsUseDefault(final EditForm form) { final String jspType = "orig/view"; final File jspFile = getJspFile(form.fileName, jspType); try { - form.content = new String(FileUtil.readBytes(jspFile), Constants.UTF_8); + form.content = encodeJsp(new String(FileUtil.readBytes(jspFile), Constants.UTF_8)); } catch (final UnsupportedEncodingException e) { throw new FessSystemException("Invalid encoding", e); } @@ -272,7 +277,7 @@ public HtmlResponse update(final EditForm form) { validate(form, messages -> {}, () -> asEditHtml(form)); verifyToken(() -> asEditHtml(form)); try { - write(jspFile.getAbsolutePath(), form.content.getBytes(Constants.UTF_8)); + write(jspFile.getAbsolutePath(), decodeJsp(form.content).getBytes(Constants.UTF_8)); saveInfo(messages -> messages.addSuccessUpdateDesignJspFile(GLOBAL, jspFile.getAbsolutePath())); } catch (final Exception e) { logger.warn("Failed to update {}", form.fileName, e); @@ -351,4 +356,15 @@ private HtmlResponse asEditHtml(final EditForm form) { data.register("displayFileName", getJspFile(form.fileName, "view").getAbsolutePath()); }); } + + public static String decodeJsp(final String value) { + return value.replaceAll("<%(?![@-])([\\s\\S]*?)%>", "<%$1%>").replaceAll("<%=([\\s\\S]*?)%>", "<%=$1%>") + .replaceAll(TRY_STATEMENT, "<% try{ %>") + .replaceAll(CACHE_AND_SESSION_INVALIDATE_STATEMENT, "<% }catch(Exception e){session.invalidate();} %>"); + } + + public static String encodeJsp(final String value) { + return value.replaceAll(Pattern.quote("<% try{ %>"), TRY_STATEMENT) + .replaceAll(Pattern.quote("<% }catch(Exception e){session.invalidate();} %>"), CACHE_AND_SESSION_INVALIDATE_STATEMENT); + } } diff --git a/src/main/resources/fess.xml b/src/main/resources/fess.xml index 310b2b420f..e048188de1 100644 --- a/src/main/resources/fess.xml +++ b/src/main/resources/fess.xml @@ -95,10 +95,6 @@ "errorSystem" "error/system.jsp" - - "errorRedirect" - "error/redirect.jsp" - "errorBadRequest" "error/badRequest.jsp" diff --git a/src/main/webapp/WEB-INF/view/error/badRequest.jsp b/src/main/webapp/WEB-INF/view/error/badRequest.jsp index 6962809400..f204509e1e 100644 --- a/src/main/webapp/WEB-INF/view/error/badRequest.jsp +++ b/src/main/webapp/WEB-INF/view/error/badRequest.jsp @@ -24,7 +24,7 @@ - + @@ -32,4 +32,4 @@ -<% }catch(Exception e){ session.invalidate();}%> +<% }catch(Exception e){session.invalidate();} %> diff --git a/src/main/webapp/WEB-INF/view/error/error.jsp b/src/main/webapp/WEB-INF/view/error/error.jsp index 90659d7758..273160f090 100644 --- a/src/main/webapp/WEB-INF/view/error/error.jsp +++ b/src/main/webapp/WEB-INF/view/error/error.jsp @@ -28,7 +28,7 @@ - + diff --git a/src/main/webapp/WEB-INF/view/error/notFound.jsp b/src/main/webapp/WEB-INF/view/error/notFound.jsp index a860ab65c6..d3238399a0 100644 --- a/src/main/webapp/WEB-INF/view/error/notFound.jsp +++ b/src/main/webapp/WEB-INF/view/error/notFound.jsp @@ -26,7 +26,7 @@ - + diff --git a/src/main/webapp/WEB-INF/view/error/system.jsp b/src/main/webapp/WEB-INF/view/error/system.jsp index 134ba7f3d4..42a15f7774 100644 --- a/src/main/webapp/WEB-INF/view/error/system.jsp +++ b/src/main/webapp/WEB-INF/view/error/system.jsp @@ -24,7 +24,7 @@ - + @@ -32,4 +32,4 @@ -<% }catch(Exception e){ session.invalidate();}%> +<% }catch(Exception e){session.invalidate();} %> diff --git a/src/test/java/org/codelibs/fess/app/web/admin/design/AdminDesignActionTest.java b/src/test/java/org/codelibs/fess/app/web/admin/design/AdminDesignActionTest.java new file mode 100644 index 0000000000..c774f4f735 --- /dev/null +++ b/src/test/java/org/codelibs/fess/app/web/admin/design/AdminDesignActionTest.java @@ -0,0 +1,42 @@ +/* + * Copyright 2012-2024 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.app.web.admin.design; + +import org.codelibs.fess.unit.UnitFessTestCase; + +public class AdminDesignActionTest extends UnitFessTestCase { + public void test_decodeJsp() { + assertEquals("<% a %>", AdminDesignAction.decodeJsp("<% a %>")); + assertEquals("<%= a %>", AdminDesignAction.decodeJsp("<%= a %>")); + assertEquals("<% a\nb %>", AdminDesignAction.decodeJsp("<% a\nb %>")); + assertEquals("<%= a\nb %>", AdminDesignAction.decodeJsp("<%= a\nb %>")); + assertEquals("<% a", AdminDesignAction.decodeJsp("<% a")); + assertEquals("<%= a", AdminDesignAction.decodeJsp("<%= a")); + assertEquals("<% try{ %>", AdminDesignAction.decodeJsp("")); + assertEquals("<% }catch(Exception e){session.invalidate();} %>", + AdminDesignAction.decodeJsp("")); + assertEquals("<% a %> %>", AdminDesignAction.decodeJsp("<% a %> %>")); + assertEquals("<% a %> <%", AdminDesignAction.decodeJsp("<% a %> <%")); + assertEquals("<% <% a %>", AdminDesignAction.decodeJsp("<% <% a %>")); + assertEquals("%> <% a %>", AdminDesignAction.decodeJsp("%> <% a %>")); + } + + public void test_encodeJsp() { + assertEquals("", AdminDesignAction.encodeJsp("<% try{ %>")); + assertEquals("", + AdminDesignAction.encodeJsp("<% }catch(Exception e){session.invalidate();} %>")); + } +} From ecba9f365c092c1158478ef31c325a38c5b4e18b Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Mon, 29 Jul 2024 11:54:01 +0900 Subject: [PATCH 56/69] #2788 Update dependencies and configurations to latest versions --- dbflute.xml | 2 +- module.xml | 2 +- plugin.xml | 16 ++++++++-------- pom.xml | 4 ++-- .../sponsor/FessMultipartRequestHandler.java | 2 +- src/main/webapp/WEB-INF/web.xml | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dbflute.xml b/dbflute.xml index c6751fd8dd..e743ff77c5 100644 --- a/dbflute.xml +++ b/dbflute.xml @@ -2,7 +2,7 @@ - + diff --git a/module.xml b/module.xml index 75b9fc1bfa..197bf06002 100644 --- a/module.xml +++ b/module.xml @@ -6,7 +6,7 @@ - + diff --git a/plugin.xml b/plugin.xml index 3ac6e39866..bd20a13ac1 100644 --- a/plugin.xml +++ b/plugin.xml @@ -17,8 +17,8 @@ - - + + @@ -26,8 +26,8 @@ - - + + @@ -35,8 +35,8 @@ - - + + @@ -44,8 +44,8 @@ - - + + diff --git a/pom.xml b/pom.xml index 87f088f178..947744cc5d 100644 --- a/pom.xml +++ b/pom.xml @@ -1360,7 +1360,7 @@ org.apache.commons - commons-fileupload2-jakarta + commons-fileupload2-jakarta-servlet6 ${commons.fileupload.version} @@ -1548,7 +1548,7 @@ org.dbflute.utflute - utflute-lastaflute-jakarta + utflute-lastaflute ${utflute.version} test diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java index 24daef7177..1e75da161a 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java @@ -29,7 +29,7 @@ import org.apache.commons.fileupload2.core.DiskFileItemFactory; import org.apache.commons.fileupload2.core.FileUploadByteCountLimitException; import org.apache.commons.fileupload2.core.FileUploadException; -import org.apache.commons.fileupload2.jakarta.JakartaServletDiskFileUpload; +import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletDiskFileUpload; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codelibs.core.lang.StringUtil; diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index d4478b3905..4ec9ebd8cd 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -17,7 +17,7 @@ @@ -119,7 +119,7 @@ - org.apache.commons.fileupload2.jakarta.JakartaFileCleaner + org.apache.commons.fileupload2.jakarta.servlet6.JakartaFileCleaner From 0df246ea530a365974027adddcd26604e91d967e Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Fri, 2 Aug 2024 10:05:20 +0900 Subject: [PATCH 57/69] update comment --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 947744cc5d..406d5e697a 100644 --- a/pom.xml +++ b/pom.xml @@ -947,7 +947,6 @@ jakarta.servlet.jsp.jstl jakarta.servlet.jsp.jstl-api ${jakarta.jstl.api.version} - @@ -963,6 +962,7 @@ org.glassfish.web jakarta.servlet.jsp.jstl + ${jakarta.jstl.version} From 17213f370a349a8b2000b1de7beef136ee065e94 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 15 Aug 2024 17:29:04 +0900 Subject: [PATCH 58/69] fix #2839 Adjust API response to conditionally include exception messages based on configuration. --- .../fess/api/engine/SearchEngineApiManager.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/codelibs/fess/api/engine/SearchEngineApiManager.java b/src/main/java/org/codelibs/fess/api/engine/SearchEngineApiManager.java index 4673ea3d0c..a37d425b77 100644 --- a/src/main/java/org/codelibs/fess/api/engine/SearchEngineApiManager.java +++ b/src/main/java/org/codelibs/fess/api/engine/SearchEngineApiManager.java @@ -102,8 +102,16 @@ public void process(final HttpServletRequest request, final HttpServletResponse throw new WebApiException(HttpServletResponse.SC_FORBIDDEN, "Invalid session."); }); } catch (final WebApiException e) { - logger.debug("Failed to access to Web API.", e); - response.sendError(e.getStatusCode(), e.getMessage()); + String message; + if (Constants.TRUE.equalsIgnoreCase(ComponentUtil.getFessConfig().getApiJsonResponseExceptionIncluded())) { + logger.warn("Failed to access to Web API.", e); + message = e.getMessage(); + } else { + final String errorCode = UUID.randomUUID().toString(); + message = "[" + errorCode + "] Failed to access to Web API."; + logger.warn(message, e); + } + response.sendError(e.getStatusCode(), message); } } From e84219b0e3c163085f38bf98d632bc9e03dbd683 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 22 Aug 2024 21:43:18 +0900 Subject: [PATCH 59/69] fix #2841 Enabled support for multiple Fess web applications on a single OpenSearch instance. --- .../java/org/codelibs/fess/Constants.java | 2 + .../maintenance/AdminMaintenanceAction.java | 2 +- .../fess/es/client/SearchEngineClient.java | 61 ++++++++++++++++--- .../codelibs/fess/helper/SuggestHelper.java | 1 + .../fess/mylasta/direction/FessConfig.java | 27 ++++++++ src/main/resources/fess_config.properties | 1 + 6 files changed, 84 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/codelibs/fess/Constants.java b/src/main/java/org/codelibs/fess/Constants.java index c459248e6d..bccfb97599 100644 --- a/src/main/java/org/codelibs/fess/Constants.java +++ b/src/main/java/org/codelibs/fess/Constants.java @@ -87,6 +87,8 @@ public class Constants extends CoreLibConstants { public static final String CRAWLING_USER_AGENT_SUFFIX = "; +http://fess.codelibs.org/bot.html)"; + public static final String DOCUMENT_INDEX_SUFFIX_PATTERN = "yyyyMMddHHmmssSSS"; + // fess properties public static final String USER_INFO_PROPERTY = "user.info"; 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 5842b7d3cc..221e80df56 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 @@ -300,7 +300,7 @@ protected boolean startReindex(final boolean replaceAliases, final boolean reset final String autoExpandReplicas) { final String docIndex = "fess"; final String fromIndex = fessConfig.getIndexDocumentUpdateIndex(); - final String toIndex = docIndex + "." + new SimpleDateFormat("yyyyMMddHHmm").format(new Date()); + final String toIndex = docIndex + "." + new SimpleDateFormat(Constants.DOCUMENT_INDEX_SUFFIX_PATTERN).format(new Date()); if (searchEngineClient.createIndex(docIndex, toIndex, numberOfShards, autoExpandReplicas, resetDictionaries)) { searchEngineClient.admin().cluster().prepareHealth(toIndex).setWaitForYellowStatus().execute(ActionListener.wrap(response -> { searchEngineClient.addMapping(docIndex, "doc", toIndex); diff --git a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java b/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java index 84f484b6a1..0004562dc9 100644 --- a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java +++ b/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java @@ -184,6 +184,8 @@ public class SearchEngineClient implements Client { private static final Logger logger = LogManager.getLogger(SearchEngineClient.class); + private static final String DOC_INDEX = "fess"; + private static final String LOG_INDEX_PREFIX = "fess_log"; private static final String USER_INDEX_PREFIX = "fess_user"; @@ -268,6 +270,18 @@ public void open() { } final FessConfig fessConfig = ComponentUtil.getFessConfig(); + if (StringUtil.isNotBlank(fessConfig.getIndexDictionaryPrefix())) { + String dictionaryPath = System.getProperty("fess.dictionary.path", StringUtil.EMPTY); + if (StringUtil.isBlank(dictionaryPath)) { + System.setProperty("fess.dictionary.path", fessConfig.getIndexDictionaryPrefix() + "/"); + } else { + if (!dictionaryPath.endsWith("/")) { + dictionaryPath = dictionaryPath + "/"; + } + System.setProperty("fess.dictionary.path", dictionaryPath + fessConfig.getIndexDictionaryPrefix() + "/"); + } + } + String httpAddress = SystemUtil.getSearchEngineHttpAddress(); if (StringUtil.isBlank(httpAddress) && (runner == null)) { switch (fessConfig.getFesenType()) { @@ -322,7 +336,7 @@ public void open() { final String configIndex = values[0]; final String configType = values[1]; - final boolean isFessIndex = "fess".equals(configIndex); + final boolean isFessIndex = DOC_INDEX.equals(configIndex); final String indexName; if (isFessIndex) { final boolean exists = existsIndex(fessConfig.getIndexDocumentUpdateIndex()); @@ -349,10 +363,10 @@ public void open() { indexName = configIndex.replaceFirst(Pattern.quote(CONFIG_INDEX_PREFIX), name); } else if (configIndex.startsWith(USER_INDEX_PREFIX)) { final String name = fessConfig.getIndexUserIndex(); - indexName = configIndex.replaceFirst(Pattern.quote(CONFIG_INDEX_PREFIX), name); + indexName = configIndex.replaceFirst(Pattern.quote(USER_INDEX_PREFIX), name); } else if (configIndex.startsWith(LOG_INDEX_PREFIX)) { final String name = fessConfig.getIndexLogIndex(); - indexName = configIndex.replaceFirst(Pattern.quote(CONFIG_INDEX_PREFIX), name); + indexName = configIndex.replaceFirst(Pattern.quote(LOG_INDEX_PREFIX), name); } else { throw new FessSystemException("Unknown config index: " + configIndex); } @@ -553,7 +567,7 @@ public void addMapping(final String index, final String docType, final String in final String mappingFile = getResourcePath(indexConfigPath, fessConfig.getFesenType(), "/" + index + "/" + docType + ".json"); try { source = FileUtil.readUTF8(mappingFile); - if ("fess".equals(index)) { + if (DOC_INDEX.equals(index)) { for (final UnaryOperator rule : docMappingRewriteRuleList) { source = rule.apply(source); } @@ -624,7 +638,23 @@ protected void createAlias(final String index, final String createdIndexName) { 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 aliasName = f.getName().replaceFirst(".json$", ""); + if (index.equals(DOC_INDEX)) { + if ("fess.search".equals(aliasName)) { + aliasName = fessConfig.getIndexDocumentSearchIndex(); + } else if ("fess.update".equals(aliasName)) { + aliasName = fessConfig.getIndexDocumentUpdateIndex(); + } + } else if (index.startsWith(CONFIG_INDEX_PREFIX)) { + final String name = fessConfig.getIndexConfigIndex(); + aliasName = aliasName.replaceFirst(Pattern.quote(CONFIG_INDEX_PREFIX), name); + } else if (index.startsWith(USER_INDEX_PREFIX)) { + final String name = fessConfig.getIndexUserIndex(); + aliasName = aliasName.replaceFirst(Pattern.quote(USER_INDEX_PREFIX), name); + } else if (index.startsWith(LOG_INDEX_PREFIX)) { + final String name = fessConfig.getIndexLogIndex(); + aliasName = aliasName.replaceFirst(Pattern.quote(LOG_INDEX_PREFIX), name); + } String source = FileUtil.readUTF8(f); if ("{}".equals(source.trim())) { source = null; @@ -646,13 +676,20 @@ protected void createAlias(final String index, final String createdIndexName) { } protected void sendConfigFiles(final String index) { + final FessConfig fessConfig = ComponentUtil.getFessConfig(); configListMap.getOrDefault(index, Collections.emptyList()).forEach(path -> { String source = null; final String filePath = indexConfigPath + "/" + index + "/" + path; + final String dictionaryPath; + if (StringUtil.isNotBlank(fessConfig.getIndexDictionaryPrefix())) { + dictionaryPath = fessConfig.getIndexDictionaryPrefix() + "/" + path; + } else { + dictionaryPath = path; + } try { source = FileUtil.readUTF8(filePath); try (CurlResponse response = - ComponentUtil.getCurlHelper().post("/_configsync/file").param("path", path).body(source).execute()) { + ComponentUtil.getCurlHelper().post("/_configsync/file").param("path", dictionaryPath).body(source).execute()) { if (response.getHttpStatusCode() == 200) { logger.info("Register {} to {}", path, index); } else if (response.getContentException() != null) { @@ -703,14 +740,20 @@ public void flushConfigFiles(final Runnable callback) { } protected String generateNewIndexName(final String configIndex) { - return configIndex + "." + new SimpleDateFormat("yyyyMMdd").format(new Date()); + return configIndex + "." + new SimpleDateFormat(Constants.DOCUMENT_INDEX_SUFFIX_PATTERN).format(new Date()); } protected void insertBulkData(final FessConfig fessConfig, final String configIndex, final String dataPath) { try { final BulkRequestBuilder builder = client.prepareBulk(); final ObjectMapper mapper = new ObjectMapper(); - Arrays.stream(FileUtil.readUTF8(dataPath).split("\n")).reduce((prev, line) -> { + final String userIndex = fessConfig.getIndexUserIndex() + ".user"; + Arrays.stream(FileUtil.readUTF8(dataPath).split("\n")).map(line -> { + return line// + .replace("\"_index\":\"fess_config.", "\"_index\":\"" + fessConfig.getIndexConfigIndex() + ".")// + .replace("\"_index\":\"fess_user.", "\"_index\":\"" + fessConfig.getIndexUserIndex() + ".")// + .replace("\"_index\":\"fess_log.", "\"_index\":\"" + fessConfig.getIndexLogIndex() + "."); + }).reduce((prev, line) -> { try { if (StringUtil.isBlank(prev)) { final Map> result = @@ -728,7 +771,7 @@ protected void insertBulkData(final FessConfig fessConfig, final String configIn }); if (result.containsKey("index")) { String source = line; - if ("fess_user.user".equals(configIndex)) { + if (userIndex.equals(configIndex)) { source = source.replace("${fess.index.initial_password}", ComponentUtil.getComponent(FessLoginAssist.class) .encryptPassword(fessConfig.getIndexUserInitialPassword())); } diff --git a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java index 682ae23006..96bf3ff421 100644 --- a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java @@ -108,6 +108,7 @@ public void init() { settingsBuilder.indexTimeout(fessConfig.getIndexIndexTimeout()); settingsBuilder.indicesTimeout(fessConfig.getIndexIndicesTimeout()); settingsBuilder.searchTimeout(fessConfig.getIndexSearchTimeout()); + settingsBuilder.setSettingsIndexName(fessConfig.getIndexDocumentSuggestIndex() + "_suggest"); suggester = Suggester.builder().settings(settingsBuilder).build(searchEngineClient, fessConfig.getIndexDocumentSuggestIndex()); if (ComponentUtil.hasPopularWordHelper()) { popularWordHelper = ComponentUtil.getPopularWordHelper(); 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 7646ea337c..8a8cb63d9f 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java @@ -718,6 +718,9 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** The key of the configuration. e.g. fess_log */ String INDEX_LOG_INDEX = "index.log.index"; + /** The key of the configuration. e.g. */ + String INDEX_DICTIONARY_PREFIX = "index.dictionary.prefix"; + /** The key of the configuration. e.g. lang,role,label,anchor,virtual_host */ String INDEX_ADMIN_ARRAY_FIELDS = "index.admin.array.fields"; @@ -4067,6 +4070,21 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction */ String getIndexLogIndex(); + /** + * Get the value for the key 'index.dictionary.prefix'.
+ * The value is, e.g.
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getIndexDictionaryPrefix(); + + /** + * Get the value for the key 'index.dictionary.prefix' as {@link Integer}.
+ * The value is, e.g.
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + * @throws NumberFormatException When the property is not integer. + */ + Integer getIndexDictionaryPrefixAsInteger(); + /** * Get the value for the key 'index.admin.array.fields'.
* The value is, e.g. lang,role,label,anchor,virtual_host
@@ -8983,6 +9001,14 @@ public String getIndexLogIndex() { return get(FessConfig.INDEX_LOG_INDEX); } + public String getIndexDictionaryPrefix() { + return get(FessConfig.INDEX_DICTIONARY_PREFIX); + } + + public Integer getIndexDictionaryPrefixAsInteger() { + return getAsInteger(FessConfig.INDEX_DICTIONARY_PREFIX); + } + public String getIndexAdminArrayFields() { return get(FessConfig.INDEX_ADMIN_ARRAY_FIELDS); } @@ -11178,6 +11204,7 @@ protected java.util.Map prepareGeneratedDefaultMap() { defaultMap.put(FessConfig.INDEX_CONFIG_INDEX, "fess_config"); defaultMap.put(FessConfig.INDEX_USER_INDEX, "fess_user"); defaultMap.put(FessConfig.INDEX_LOG_INDEX, "fess_log"); + defaultMap.put(FessConfig.INDEX_DICTIONARY_PREFIX, ""); defaultMap.put(FessConfig.INDEX_ADMIN_ARRAY_FIELDS, "lang,role,label,anchor,virtual_host"); defaultMap.put(FessConfig.INDEX_ADMIN_DATE_FIELDS, "expires,created,timestamp,last_modified"); defaultMap.put(FessConfig.INDEX_ADMIN_INTEGER_FIELDS, ""); diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties index b537c01c23..d16dfe2cd6 100644 --- a/src/main/resources/fess_config.properties +++ b/src/main/resources/fess_config.properties @@ -354,6 +354,7 @@ index.document.crawler.filter.number_of_replicas=1 index.config.index=fess_config index.user.index=fess_user index.log.index=fess_log +index.dictionary.prefix= # doc management index.admin.array.fields=lang,role,label,anchor,virtual_host From dd4af0dcf6667bebfb537eed778f02841dd3f864 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Sat, 24 Aug 2024 11:22:00 +0900 Subject: [PATCH 60/69] #2841 Fix fess_basic_config alias handling for Fess multi-instance support. --- .../fess/app/web/admin/backup/AdminBackupAction.java | 12 ++++++++++-- .../codelibs/fess/es/client/SearchEngineClient.java | 6 +++++- 2 files changed, 15 insertions(+), 3 deletions(-) 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 e22245244b..b238a07d1a 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 @@ -346,7 +346,7 @@ public ActionResponse download(final String id) { } }); } else { - final String index; + String index; final String filename; if (id.endsWith(".bulk")) { index = id.substring(0, id.length() - 5); @@ -355,9 +355,17 @@ public ActionResponse download(final String id) { index = id; filename = id + ".bulk"; } + if ("fess_config".equals(index)) { + index = fessConfig.getIndexConfigIndex(); + } else if ("fess_user".equals(index)) { + index = fessConfig.getIndexUserIndex(); + } else if ("fess_basic_config".equals(index) && !"fess_config".equals(fessConfig.getIndexConfigIndex())) { + index = "basic_" + fessConfig.getIndexConfigIndex(); + } + final String alias = index; return asStream(filename).contentTypeOctetStream().stream(out -> { try (final BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out.stream(), Constants.CHARSET_UTF_8))) { - SearchEngineUtil.scroll(index, hit -> { + SearchEngineUtil.scroll(alias, hit -> { try { writer.write("{\"index\":{\"_index\":\"" + hit.getIndex() + "\",\"_id\":\"" + StringEscapeUtils.escapeJson(hit.getId()) + "\"}}\n"); diff --git a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java b/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java index 0004562dc9..ff0166721e 100644 --- a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java +++ b/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java @@ -647,7 +647,11 @@ protected void createAlias(final String index, final String createdIndexName) { } } else if (index.startsWith(CONFIG_INDEX_PREFIX)) { final String name = fessConfig.getIndexConfigIndex(); - aliasName = aliasName.replaceFirst(Pattern.quote(CONFIG_INDEX_PREFIX), name); + if ("fess_basic_config".equals(aliasName) && !CONFIG_INDEX_PREFIX.equals(name)) { + aliasName = aliasName.replaceFirst("fess_basic_config", "basic_" + name); + } else { + aliasName = aliasName.replaceFirst(Pattern.quote(CONFIG_INDEX_PREFIX), name); + } } else if (index.startsWith(USER_INDEX_PREFIX)) { final String name = fessConfig.getIndexUserIndex(); aliasName = aliasName.replaceFirst(Pattern.quote(USER_INDEX_PREFIX), name); From 61343536008035d6329936172ecb568a02b57065 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Sun, 8 Sep 2024 15:18:15 +0900 Subject: [PATCH 61/69] fix #2842 Add http.fileupload.max.file.count property and refactor file upload handling logic --- .../fess/mylasta/direction/FessConfig.java | 27 ++ .../sponsor/FessMultipartRequestHandler.java | 275 +++++++++--------- src/main/resources/fess_config.properties | 1 + 3 files changed, 168 insertions(+), 135 deletions(-) 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 8a8cb63d9f..737862b42d 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java @@ -310,6 +310,9 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** The key of the configuration. e.g. 262144 */ String HTTP_FILEUPLOAD_THRESHOLD_SIZE = "http.fileupload.threshold.size"; + /** The key of the configuration. e.g. 10 */ + String HTTP_FILEUPLOAD_MAX_FILE_COUNT = "http.fileupload.max.file.count"; + /** The key of the configuration. e.g. groovy */ String CRAWLER_DEFAULT_SCRIPT = "crawler.default.script"; @@ -2646,6 +2649,21 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction */ Integer getHttpFileuploadThresholdSizeAsInteger(); + /** + * Get the value for the key 'http.fileupload.max.file.count'.
+ * The value is, e.g. 10
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getHttpFileuploadMaxFileCount(); + + /** + * Get the value for the key 'http.fileupload.max.file.count' as {@link Integer}.
+ * The value is, e.g. 10
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + * @throws NumberFormatException When the property is not integer. + */ + Integer getHttpFileuploadMaxFileCountAsInteger(); + /** * Get the value for the key 'crawler.default.script'.
* The value is, e.g. groovy
@@ -8221,6 +8239,14 @@ public Integer getHttpFileuploadThresholdSizeAsInteger() { return getAsInteger(FessConfig.HTTP_FILEUPLOAD_THRESHOLD_SIZE); } + public String getHttpFileuploadMaxFileCount() { + return get(FessConfig.HTTP_FILEUPLOAD_MAX_FILE_COUNT); + } + + public Integer getHttpFileuploadMaxFileCountAsInteger() { + return getAsInteger(FessConfig.HTTP_FILEUPLOAD_MAX_FILE_COUNT); + } + public String getCrawlerDefaultScript() { return get(FessConfig.CRAWLER_DEFAULT_SCRIPT); } @@ -11066,6 +11092,7 @@ protected java.util.Map prepareGeneratedDefaultMap() { defaultMap.put(FessConfig.HTTP_PROXY_PASSWORD, ""); defaultMap.put(FessConfig.HTTP_FILEUPLOAD_MAX_SIZE, "262144000"); defaultMap.put(FessConfig.HTTP_FILEUPLOAD_THRESHOLD_SIZE, "262144"); + defaultMap.put(FessConfig.HTTP_FILEUPLOAD_MAX_FILE_COUNT, "10"); defaultMap.put(FessConfig.CRAWLER_DEFAULT_SCRIPT, "groovy"); defaultMap.put(FessConfig.CRAWLER_HTTP_thread_pool_SIZE, "0"); defaultMap.put(FessConfig.CRAWLER_DOCUMENT_MAX_SITE_LENGTH, "100"); diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java index 1e75da161a..7d83a4a123 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java @@ -20,8 +20,7 @@ import java.io.InputStream; import java.io.Serializable; import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.util.Hashtable; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -32,14 +31,10 @@ import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletDiskFileUpload; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.util.ComponentUtil; import org.dbflute.helper.message.ExceptionMessageBuilder; import org.lastaflute.core.message.UserMessages; -import org.lastaflute.di.exception.IORuntimeException; -import org.lastaflute.web.LastaWebKey; import org.lastaflute.web.exception.Forced404NotFoundException; -import org.lastaflute.web.ruts.config.ModuleConfig; import org.lastaflute.web.ruts.multipart.MultipartFormFile; import org.lastaflute.web.ruts.multipart.MultipartRequestHandler; import org.lastaflute.web.ruts.multipart.MultipartRequestWrapper; @@ -51,6 +46,8 @@ import jakarta.servlet.http.HttpServletRequest; /** + * The handler of multipart request (fileupload request).
+ * This instance is created per one multipart request. * @author modified by jflute (originated in Seasar) */ public class FessMultipartRequestHandler implements MultipartRequestHandler { @@ -59,65 +56,92 @@ public class FessMultipartRequestHandler implements MultipartRequestHandler { // Definition // ========== private static final Logger logger = LogManager.getLogger(FessMultipartRequestHandler.class); - protected static final String JAVA_IO_TMPDIR_KEY = "java.io.tmpdir"; + + // ----------------------------------------------------- + // Temporary Directory + // ------------------- + // used as repository for requested parameters + protected static final String CONTEXT_TEMPDIR_KEY = "javax.servlet.context.tempdir"; // prior + protected static final String JAVA_IO_TMPDIR_KEY = "java.io.tmpdir"; // secondary // =================================================================================== // Attribute // ========= - protected Map elementsAll; - protected Map elementsFile; - protected Map elementsText; + // keeping parsed request parameters, normal texts or uploaded files + // keys are requested parameter names (treated as field name here) + protected Map elementsAll; // lazy-loaded, then after not null + protected Map elementsFile; // me too + protected Map elementsText; // me too // =================================================================================== // Handle Request // ============== @Override public void handleRequest(final HttpServletRequest request) throws ServletException { - // /- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // copied from super's method and extends it - // basically for JVN#14876762 - // thought not all problems are resolved however the main case is safety - // - - - - - - - - - -/ - final JakartaServletDiskFileUpload upload = createServletFileUpload(request); + final JakartaServletDiskFileUpload upload = createDiskFileUpload(request); prepareElementsHash(); try { final List items = parseRequest(request, upload); mappingParameter(request, items); - } catch (final FileUploadByteCountLimitException e) { + } catch (final FileUploadByteCountLimitException e) { // special handling handleSizeLimitExceededException(request, e); - } catch (final FileUploadException e) { + } catch (final FileUploadException e) { // contains fileCount exceeded handleFileUploadException(e); } } - protected ModuleConfig getModuleConfig(final HttpServletRequest request) { - return (ModuleConfig) request.getAttribute(LastaWebKey.MODULE_CONFIG_KEY); + protected void prepareElementsHash() { // traditional name + // #thinking jflute might lazy-loaded be unneeded? because created per request (2024/09/08) + elementsAll = new HashMap<>(); + elementsText = new HashMap<>(); + elementsFile = new HashMap<>(); + } + + protected List parseRequest(final HttpServletRequest request, final JakartaServletDiskFileUpload upload) + throws FileUploadException { + return upload.parseRequest(request); } // =================================================================================== - // Create ServletFileUpload - // ======================== - protected JakartaServletDiskFileUpload createServletFileUpload(final HttpServletRequest request) { + // ServletFileUpload + // ================= + protected JakartaServletDiskFileUpload createDiskFileUpload(final HttpServletRequest request) { final DiskFileItemFactory fileItemFactory = createDiskFileItemFactory(); final JakartaServletDiskFileUpload upload = newServletFileUpload(fileItemFactory); - final Charset charset = getRequestCharset(request); - if (charset != null) { - upload.setHeaderCharset(charset); - } - upload.setSizeMax(getSizeMax()); + setupServletFileUpload(upload, request); return upload; } - protected Charset getRequestCharset(final HttpServletRequest request) { - final String characterEncoding = request.getCharacterEncoding(); - try { - return Charset.forName(characterEncoding); - } catch (Exception e) { - logger.warn("Invalid charset: {}", characterEncoding, e); + // ----------------------------------------------------- + // DiskFileItemFactory Settings + // ---------------------------- + protected DiskFileItemFactory createDiskFileItemFactory() { + final int sizeThreshold = getSizeThreshold(); + final File repository = createRepositoryFile(); + return DiskFileItemFactory.builder().setBufferSize(sizeThreshold).setFile(repository).get(); + } + + protected int getSizeThreshold() { + return ComponentUtil.getFessConfig().getHttpFileuploadThresholdSizeAsInteger().intValue(); + } + + protected File createRepositoryFile() { + return new File(getRepositoryPath()); + } + + protected String getRepositoryPath() { + final ServletContext servletContext = LaServletContextUtil.getServletContext(); + final File tempDirFile = (File) servletContext.getAttribute(CONTEXT_TEMPDIR_KEY); + String tempDir = tempDirFile.getAbsolutePath(); + if (tempDir == null || tempDir.length() == 0) { + tempDir = System.getProperty(JAVA_IO_TMPDIR_KEY); } - return null; + return tempDir; // must be not null } + // ----------------------------------------------------- + // ServletFileUpload Settings + // -------------------------- protected JakartaServletDiskFileUpload newServletFileUpload(final DiskFileItemFactory fileItemFactory) { return new JakartaServletDiskFileUpload(fileItemFactory) { @Override @@ -129,6 +153,8 @@ public byte[] getBoundary(final String contentType) { // for security }; } + // #for_now jflute to suppress CVE-2014-0050 even if commons-fileupload is older than safety version (2024/09/08) + // but if you use safety version, this extension is basically unneeded (or you can use it as double check) protected void checkBoundarySize(final String contentType, final byte[] boundary) { final int boundarySize = boundary.length; final int limitSize = getBoundaryLimitSize(); @@ -147,12 +173,12 @@ protected void throwTooLongBoundarySizeException(final String contentType, final final ExceptionMessageBuilder br = new ExceptionMessageBuilder(); br.addNotice("Too long boundary size so treats it as 404."); br.addItem("Advice"); - br.addElement("Against for JVN14876762."); + br.addElement("Against for CVE-2014-0050 (JVN14876762)."); br.addElement("Boundary size is limited by Framework."); br.addElement("Too long boundary is treated as 404 because it's thought of as attack."); br.addElement(""); br.addElement("While, you can override the boundary limit size"); - br.addElement(" in " + FessMultipartRequestHandler.class.getSimpleName() + "."); + br.addElement(" in " + getClass().getSimpleName() + "."); br.addItem("Content Type"); br.addElement(contentType); br.addItem("Boundary Size"); @@ -163,32 +189,26 @@ protected void throwTooLongBoundarySizeException(final String contentType, final throw new Forced404NotFoundException(msg, UserMessages.empty()); // heavy attack!? so give no page to tell wasted action } - protected DiskFileItemFactory createDiskFileItemFactory() { - final File repository = createRepositoryFile(); - return DiskFileItemFactory.builder().setFile(repository).setBufferSize(getSizeThreshold()).get(); - } - - protected File createRepositoryFile() { - return new File(getRepositoryPath()); + protected void setupServletFileUpload(final JakartaServletDiskFileUpload upload, final HttpServletRequest request) { + upload.setHeaderCharset(Charset.forName(request.getCharacterEncoding())); + upload.setSizeMax(getSizeMax()); + upload.setFileCountMax(getFileCountMax()); // since commons-fileupload-1.5 } - // =================================================================================== - // Handling Parts - // ============== - protected void prepareElementsHash() { - elementsText = new Hashtable<>(); - elementsFile = new Hashtable<>(); - elementsAll = new Hashtable<>(); + protected long getSizeMax() { + return ComponentUtil.getFessConfig().getHttpFileuploadMaxSizeAsInteger().longValue(); } - protected List parseRequest(final HttpServletRequest request, final JakartaServletDiskFileUpload upload) - throws FileUploadException { - return upload.parseRequest(request); + protected long getFileCountMax() { + return ComponentUtil.getFessConfig().getHttpFileuploadMaxFileCountAsInteger().longValue(); } + // =================================================================================== + // Parameter Mapping + // ================= protected void mappingParameter(final HttpServletRequest request, final List items) { showFieldLoggingTitle(); - for (final DiskFileItem item : items) { + for (DiskFileItem item : items) { if (item.isFormField()) { showFormFieldParameter(item); addTextParameter(request, item); @@ -202,8 +222,11 @@ protected void mappingParameter(final HttpServletRequest request, final List -1 && backslashIndex > -1) { return fileName.substring(backslashIndex + 1); } @@ -392,8 +397,8 @@ protected String getBaseFileName(final String filePath) { public void destroy() { try { fileItem.delete(); - } catch (IOException e) { - throw new IORuntimeException(e); + } catch (final IOException e) { + throw new IllegalStateException("Failed to delete the fileItem: " + fileItem, e); } } @@ -407,17 +412,17 @@ public String toString() { // Accessor // ======== @Override - public Map getAllElements() { + public Map getAllElements() { // not null after parsing return elementsAll; } @Override - public Map getTextElements() { + public Map getTextElements() { // me too return elementsText; } @Override - public Map getFileElements() { + public Map getFileElements() { // me too return elementsFile; } -} +} \ No newline at end of file diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties index d16dfe2cd6..704f79906d 100644 --- a/src/main/resources/fess_config.properties +++ b/src/main/resources/fess_config.properties @@ -195,6 +195,7 @@ http.proxy.username= http.proxy.password= http.fileupload.max.size=262144000 http.fileupload.threshold.size=262144 +http.fileupload.max.file.count=10 # ======================================================================================== # Index From 3726fbec4048279bd3dcc37766d143428a825a75 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Thu, 26 Sep 2024 10:31:44 +0900 Subject: [PATCH 62/69] fix #2844 Ignore case sensitivity in canonical URL comparison to prevent unnecessary redirects --- .../codelibs/fess/crawler/transformer/FessXpathTransformer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 56bc954aee..92d31ec0a2 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java @@ -342,7 +342,7 @@ protected Map processAdditionalData(final Map da final Document document) { // canonical final String canonicalUrl = getCanonicalUrl(responseData, document); - if (canonicalUrl != null && !canonicalUrl.equals(responseData.getUrl()) && isValidUrl(canonicalUrl) + if (canonicalUrl != null && !canonicalUrl.equalsIgnoreCase(responseData.getUrl()) && isValidUrl(canonicalUrl) && isValidCanonicalUrl(responseData.getUrl(), canonicalUrl)) { final Set childUrlSet = new HashSet<>(); childUrlSet.add(RequestDataBuilder.newRequestData().get().url(canonicalUrl).build()); From b5b6e45200213a27aa5e2a25c326284927e922db Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Mon, 30 Sep 2024 22:06:45 +0900 Subject: [PATCH 63/69] update doc --- README.md | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index d3d5d9e75c..f3e77f36f1 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ Fess Enterprise Search Server [![Tweet](https://img.shields.io/twitter/url/http/ Fess is a very powerful and easily deployable Enterprise Search Server. You can quickly install and run Fess on any platform where you can run the Java Runtime Environment. Fess is provided under the [Apache License 2.0](LICENSE). -Fess is based on [OpenSearch](https://github.com/opensearch-project/OpenSearch)/[Elasticsearch](https://github.com/elastic/elasticsearch), but knowledge/experience about OpenSearch/Elasticsearch is _not_ required. Fess provides an easy to use Administration GUI to configure the system via your browser. -Fess also contains a Crawler, which can crawl documents on a [web server](https://fess.codelibs.org/14.11/admin/webconfig-guide.html), [file system](https://fess.codelibs.org/14.11/admin/fileconfig-guide.html), or [Data Store](https://fess.codelibs.org/14.11/admin/dataconfig-guide.html) (such as a CSV or database). Many file formats are supported including (but not limited to): Microsoft Office, PDF, and zip. +Fess is based on [OpenSearch](https://github.com/opensearch-project/OpenSearch), but knowledge/experience about OpenSearch is _not_ required. Fess provides an easy to use Administration GUI to configure the system via your browser. +Fess also contains a Crawler, which can crawl documents on a [web server](https://fess.codelibs.org/14.17/admin/webconfig-guide.html), [file system](https://fess.codelibs.org/14.17/admin/fileconfig-guide.html), or [Data Store](https://fess.codelibs.org/14.17/admin/dataconfig-guide.html) (such as a CSV or database). Many file formats are supported including (but not limited to): Microsoft Office, PDF, and zip. *[Fess Site Search](https://github.com/codelibs/fess-site-search)* is a free alternative to [Google Site Search](https://enterprise.google.com/search/products/gss.html). For more details, see the [FSS JS Generator documentation](https://fss-generator.codelibs.org/docs/manual). @@ -27,15 +27,15 @@ There are 2 ways to try Fess. The first is to download and install yourself. The ### Download and Install/Run -Fess 14.11 is now available and can be downloaded on the [Releases page](https://github.com/codelibs/fess/releases "download"). Downloads come in 3 flavors: deb, rpm, zip. +Fess 14.17 is now available and can be downloaded on the [Releases page](https://github.com/codelibs/fess/releases "download"). Downloads come in 3 flavors: deb, rpm, zip. The following commands show how to use the zip download: - $ unzip fess-14.11.x.zip - $ cd fess-14.11.x + $ unzip fess-14.17.x.zip + $ cd fess-14.17.x $ ./bin/fess -For more details, see the [Installation Guide](https://fess.codelibs.org/14.11/install/index.html). +For more details, see the [Installation Guide](https://fess.codelibs.org/14.17/install/index.html). ### Docker @@ -51,7 +51,7 @@ We provide Docker images on [ghcr.io](https://github.com/orgs/codelibs/packages) ![Admin UI](https://fess.codelibs.org/_images/fess_admin_dashboard.png) -You can register crawling targets in the Admin UI on the (Web, File, Data Store) crawler configuration pages, and then start the Crawler manually on the [Scheduler page](https://fess.codelibs.org/14.11/admin/scheduler-guide.html). +You can register crawling targets in the Admin UI on the (Web, File, Data Store) crawler configuration pages, and then start the Crawler manually on the [Scheduler page](https://fess.codelibs.org/14.17/admin/scheduler-guide.html). ## Migration from another search provider @@ -59,7 +59,7 @@ Please see [MIGRATION.md](MIGRATION.md). ## Data Store -Currently, Fess supports crawling the following [storage locations and APIs](https://fess.codelibs.org/14.11/admin/dataconfig-guide.html): +Currently, Fess supports crawling the following [storage locations and APIs](https://fess.codelibs.org/14.17/admin/dataconfig-guide.html): - [Confluence/Jira](https://github.com/codelibs/fess-ds-atlassian) - [Box](https://github.com/codelibs/fess-ds-box) @@ -157,7 +157,7 @@ If you want to add labels/messages for your language, please translate propertie * [fess_label_en.properties](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_label_en.properties) * [fess_message_en.properties](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_message_en.properties) -For search/index analyzer, if [doc.json](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_indices/fess/doc.json) contains lang\_[lang] for your language, please modify the analyzer for your language. For more details about Analyzers, see the [Elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/analysis-analyzers.html). +For search/index analyzer, if [doc.json](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_indices/fess/doc.json) contains lang\_[lang] for your language, please modify the analyzer for your language. For more details about Analyzers, see the [OpenSearch documentation](https://opensearch.org/docs/latest/analyzers/search-analyzers/). We welcome pull requests for your language. @@ -168,4 +168,3 @@ We welcome pull requests for your language. * [Lasta Job](https://github.com/lastaflute/lasta-job "Lasta Job"): Job Scheduler * [Fess Crawler](https://github.com/codelibs/fess-crawler "Fess Crawler"): Web Crawler * [OpenSearch](https://opensearch.org/ "OpenSearch"): Search Engine -* [Elasticsearch](https://github.com/elastic/elasticsearch "Elasticsearch"): Search Engine From 3cdc706dcb4fdace1aa5d12e47538d0e47c1ea93 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Tue, 1 Oct 2024 23:13:38 +0900 Subject: [PATCH 64/69] fix #2846 Set query.orsearch.min.hit.count to -1 to disable automatic OR-based re-search. --- src/main/resources/fess_config.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties index 704f79906d..ab1cd5b4ea 100644 --- a/src/main/resources/fess_config.properties +++ b/src/main/resources/fess_config.properties @@ -445,7 +445,7 @@ query.track.total.hits=10000 query.geo.fields=location query.browser.lang.parameter.name=browser_lang query.replace.term.with.prefix.query=true -query.orsearch.min.hit.count=0 +query.orsearch.min.hit.count=-1 query.highlight.terminal.chars=u0021u002Cu002Eu003Fu0589u061Fu06D4u0700u0701u0702u0964u104Au104Bu1362u1367u1368u166Eu1803u1809u203Cu203Du2047u2048u2049u3002uFE52uFE57uFF01uFF0EuFF1FuFF61 query.highlight.fragment.size=60 query.highlight.number.of.fragments=2 From 54e7cdf9e50a2c85e6421a655413a452b2b05355 Mon Sep 17 00:00:00 2001 From: hi-yamap <141031278+hi-yamap@users.noreply.github.com> Date: Fri, 4 Oct 2024 08:12:10 +0900 Subject: [PATCH 65/69] bugfix OpenIdConnectAuthenticator (#2845) --- .../sso/oic/OpenIdConnectAuthenticator.java | 105 +++++++++++------- 1 file changed, 62 insertions(+), 43 deletions(-) diff --git a/src/main/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java b/src/main/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java index 5db70ac683..d01db0e2e4 100644 --- a/src/main/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java +++ b/src/main/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java @@ -105,7 +105,6 @@ public LoginCredential getLoginCredential() { if (sesState.equals(reqState) && StringUtil.isNotBlank(code)) { return processCallback(request, code); } - return null; } } @@ -171,54 +170,74 @@ protected void parseJwtClaim(final String jwtClaim, final Map at if (name != null) { jsonParser.nextToken(); - // TODO other parameters - switch (name) { - case "iss": - attributes.put("iss", jsonParser.getText()); - break; - case "sub": - attributes.put("sub", jsonParser.getText()); - break; - case "azp": - attributes.put("azp", jsonParser.getText()); - break; - case "email": - attributes.put("email", jsonParser.getText()); - break; - case "at_hash": - attributes.put("at_hash", jsonParser.getText()); - break; - case "email_verified": - attributes.put("email_verified", jsonParser.getText()); - break; - case "aud": - attributes.put("aud", jsonParser.getText()); - break; - case "iat": - attributes.put("iat", jsonParser.getText()); - break; - case "exp": - attributes.put("exp", jsonParser.getText()); - break; - case "groups": - final List list = new ArrayList<>(); - while (jsonParser.nextToken() != JsonToken.END_ARRAY) { - final String group = jsonParser.getText(); - list.add(group); - } - if (logger.isDebugEnabled()) { - logger.debug("groups: {}", list); - } - attributes.put("groups", list.toArray(new String[list.size()])); - break; - default: - break; + if (jsonParser.getCurrentToken() == JsonToken.START_ARRAY) { + // Handle array type + attributes.put(name, parseArray(jsonParser)); + } else if (jsonParser.getCurrentToken() == JsonToken.START_OBJECT) { + // Handle nested object type + attributes.put(name, parseObject(jsonParser)); + } else { + // Handle primitive types (string, number, boolean, etc.) + attributes.put(name, parsePrimitive(jsonParser)); } } } } } + private Object parsePrimitive(JsonParser jsonParser) throws IOException { + JsonToken token = jsonParser.getCurrentToken(); + switch (token) { + case VALUE_STRING: + return jsonParser.getText(); + case VALUE_NUMBER_INT: + return jsonParser.getLongValue(); + case VALUE_NUMBER_FLOAT: + return jsonParser.getDoubleValue(); + case VALUE_TRUE: + return true; + case VALUE_FALSE: + return false; + case VALUE_NULL: + return null; + default: + return null; // Or throw an exception if unexpected token + } + } + + private Object parseArray(JsonParser jsonParser) throws IOException { + List list = new ArrayList<>(); + while (jsonParser.nextToken() != JsonToken.END_ARRAY) { + if (jsonParser.getCurrentToken() == JsonToken.START_OBJECT) { + list.add(parseObject(jsonParser)); + } else if (jsonParser.getCurrentToken() == JsonToken.START_ARRAY) { + list.add(parseArray(jsonParser)); // Nested array + } else { + list.add(parsePrimitive(jsonParser)); + } + } + return list; + } + + private Map parseObject(JsonParser jsonParser) throws IOException { + Map nestedMap = new HashMap<>(); + while (jsonParser.nextToken() != JsonToken.END_OBJECT) { + String fieldName = jsonParser.getCurrentName(); + if (fieldName != null) { + jsonParser.nextToken(); // Move to the value of the current field + + if (jsonParser.getCurrentToken() == JsonToken.START_ARRAY) { + nestedMap.put(fieldName, parseArray(jsonParser)); + } else if (jsonParser.getCurrentToken() == JsonToken.START_OBJECT) { + nestedMap.put(fieldName, parseObject(jsonParser)); + } else { + nestedMap.put(fieldName, parsePrimitive(jsonParser)); + } + } + } + return nestedMap; + } + protected TokenResponse getTokenUrl(final String code) throws IOException { return new AuthorizationCodeTokenRequest(httpTransport, jsonFactory, new GenericUrl(getOicTokenServerUrl()), code)// .setGrantType("authorization_code")// From f9b16cfc348899d92db868ff2b5ff6d8200d9f93 Mon Sep 17 00:00:00 2001 From: hi-yamap <141031278+hi-yamap@users.noreply.github.com> Date: Fri, 11 Oct 2024 07:53:20 +0900 Subject: [PATCH 66/69] bugfix OpenIdConnectAuthenticator (#2847) Fixed an issue where the type of `attributes["groups"]` had changed from `String[]` to `List`. Add unittest. --- .../sso/oic/OpenIdConnectAuthenticator.java | 5 ++ .../oic/OpenIdConnectAuthenticatorTest.java | 46 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 src/test/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticatorTest.java diff --git a/src/main/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java b/src/main/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java index d01db0e2e4..d54b9a97b7 100644 --- a/src/main/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java +++ b/src/main/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java @@ -216,6 +216,11 @@ private Object parseArray(JsonParser jsonParser) throws IOException { list.add(parsePrimitive(jsonParser)); } } + + if (list.stream().allMatch(String.class::isInstance)) { + return list.toArray(new String[list.size()]); + } + return list; } diff --git a/src/test/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticatorTest.java b/src/test/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticatorTest.java new file mode 100644 index 0000000000..1219c35b0f --- /dev/null +++ b/src/test/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticatorTest.java @@ -0,0 +1,46 @@ +/* + * Copyright 2012-2024 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.sso.oic; + +import static org.junit.Assert.assertArrayEquals; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import org.codelibs.fess.unit.UnitFessTestCase; + +public class OpenIdConnectAuthenticatorTest extends UnitFessTestCase { + public void test_parseJwtClaim() throws IOException { + // Setup + OpenIdConnectAuthenticator authenticator = new OpenIdConnectAuthenticator(); + final Map attributes = new HashMap<>(); + String jwtClaim = "{\"sub\":\"1234567890\",\"name\":\"John Doe\",\"groups\":[\"group1\",\"group2\"]}"; + + // Execute + authenticator.parseJwtClaim(jwtClaim, attributes); + + // Verify + assertEquals("1234567890", attributes.get("sub")); + assertEquals("John Doe", attributes.get("name")); + + // Check groups array + assertTrue(attributes.get("groups") instanceof String[]); + String[] groupArray = (String[]) attributes.get("groups"); + assertArrayEquals(new String[] { "group1", "group2" }, groupArray); + + } +} From 62d89fbf250bf61dccfa8b89b1e3143389213c2f Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Sat, 12 Oct 2024 06:11:58 +0900 Subject: [PATCH 67/69] fix #2848 Refactor code: Replace redundant conditions and enhance readability across several classes. --- src/main/java/org/codelibs/fess/FessBoot.java | 4 +- .../fess/api/json/SearchApiManager.java | 24 +- .../web/admin/backup/AdminBackupAction.java | 14 +- .../web/admin/design/AdminDesignAction.java | 9 +- .../maintenance/AdminMaintenanceAction.java | 4 +- .../admin/scheduler/AdminSchedulerAction.java | 12 +- .../web/admin/upgrade/AdminUpgradeAction.java | 396 ++++++++++++++++-- .../codelibs/fess/app/web/api/ApiResult.java | 2 +- .../admin/backup/ApiAdminBackupAction.java | 14 +- .../web/api/admin/searchlist/SearchBody.java | 2 +- .../base/login/OpenIdConnectCredential.java | 7 +- .../AbstractFessFileTransformer.java | 6 +- .../crawler/transformer/FessTransformer.java | 8 +- .../transformer/FessXpathTransformer.java | 6 +- .../fess/crawler/util/FieldConfigs.java | 10 +- .../codelibs/fess/dict/DictionaryFile.java | 2 +- .../fess/dict/kuromoji/KuromojiFile.java | 2 +- .../fess/dict/kuromoji/KuromojiItem.java | 2 +- .../fess/dict/mapping/CharMappingFile.java | 2 +- .../fess/dict/mapping/CharMappingItem.java | 2 +- .../fess/dict/protwords/ProtwordsFile.java | 2 +- .../fess/dict/protwords/ProtwordsItem.java | 2 +- .../stemmeroverride/StemmerOverrideFile.java | 2 +- .../stemmeroverride/StemmerOverrideItem.java | 4 +- .../fess/dict/stopwords/StopwordsFile.java | 2 +- .../fess/dict/stopwords/StopwordsItem.java | 2 +- .../fess/dict/synonym/SynonymFile.java | 2 +- .../fess/dict/synonym/SynonymItem.java | 2 +- .../codelibs/fess/entity/HighlightInfo.java | 8 +- .../codelibs/fess/entity/QueryContext.java | 4 +- .../fess/es/client/SearchEngineClient.java | 77 ++-- .../fess/es/config/exentity/DataConfig.java | 17 +- .../es/config/exentity/WebAuthentication.java | 14 +- .../fess/es/config/exentity/WebConfig.java | 11 +- .../fess/es/query/StoredLtrQueryBuilder.java | 4 +- .../ContainerNotAvailableException.java | 2 +- .../java/org/codelibs/fess/exec/Crawler.java | 3 +- .../fess/helper/CrawlerLogHelper.java | 4 +- .../codelibs/fess/helper/IndexingHelper.java | 4 +- .../fess/helper/IntervalControlHelper.java | 4 +- .../codelibs/fess/helper/LabelTypeHelper.java | 4 +- .../codelibs/fess/helper/ProcessHelper.java | 2 +- .../codelibs/fess/helper/SearchHelper.java | 4 +- .../codelibs/fess/helper/SuggestHelper.java | 4 +- .../org/codelibs/fess/helper/ViewHelper.java | 5 +- .../fess/helper/WebFsIndexHelper.java | 3 +- .../fess/indexer/DocBoostMatcher.java | 4 +- .../codelibs/fess/indexer/IndexUpdater.java | 4 +- .../java/org/codelibs/fess/job/ExecJob.java | 4 +- .../fess/job/GenerateThumbnailJob.java | 2 +- .../fess/mylasta/direction/FessConfig.java | 8 +- .../fess/mylasta/direction/FessProp.java | 21 +- .../sponsor/FessMultipartRequestHandler.java | 6 +- .../fess/query/DefaultQueryBuilder.java | 2 +- .../org/codelibs/fess/query/QueryCommand.java | 2 +- .../codelibs/fess/query/TermQueryCommand.java | 15 +- .../fess/query/TermRangeQueryCommand.java | 4 +- .../fess/query/parser/QueryParser.java | 15 +- .../fess/rank/fusion/RankFusionProcessor.java | 4 +- .../org/codelibs/fess/score/ScoreBooster.java | 4 +- .../sso/oic/OpenIdConnectAuthenticator.java | 74 ++-- .../fess/sso/spnego/SpnegoAuthenticator.java | 40 +- .../fess/thumbnail/ThumbnailManager.java | 8 +- .../fess/thumbnail/impl/CommandGenerator.java | 4 +- .../codelibs/fess/timer/MonitorTarget.java | 4 +- .../org/codelibs/fess/util/PrunedTag.java | 6 +- .../codelibs/fess/util/QueryResponseList.java | 2 +- .../codelibs/fess/util/RenderDataUtil.java | 2 +- .../org/codelibs/fess/util/ResourceUtil.java | 2 +- .../oic/OpenIdConnectAuthenticatorTest.java | 13 +- 70 files changed, 660 insertions(+), 310 deletions(-) diff --git a/src/main/java/org/codelibs/fess/FessBoot.java b/src/main/java/org/codelibs/fess/FessBoot.java index 1050d79de9..85b9744e05 100644 --- a/src/main/java/org/codelibs/fess/FessBoot.java +++ b/src/main/java/org/codelibs/fess/FessBoot.java @@ -186,8 +186,8 @@ public void setupServerConfigIfNeeds(final BootLogger logger, final Tomcat serve }); doSetupServerConfig(logger, props, "sameSiteCookies", value -> { for (final Container container : server.getHost().findChildren()) { - if ((container instanceof final Context context) - && (context.getCookieProcessor() instanceof final CookieProcessorBase cookieProcessor)) { + if (container instanceof final Context context + && context.getCookieProcessor() instanceof final CookieProcessorBase cookieProcessor) { cookieProcessor.setSameSiteCookies(value); } } diff --git a/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java b/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java index 730c3ad45b..415df554a9 100644 --- a/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java +++ b/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java @@ -120,7 +120,8 @@ protected FormatType detectFormatType(final HttpServletRequest request) { return FormatType.SEARCH; } final String type = value.toLowerCase(Locale.ROOT); - if ("documents".equals(type)) { + switch (type) { + case "documents": if (values.length > 5 && "favorite".equals(values[5])) { request.setAttribute(DOC_ID_FIELD, values[4]); return FormatType.FAVORITE; @@ -129,21 +130,18 @@ protected FormatType detectFormatType(final HttpServletRequest request) { return FormatType.SCROLL; } return FormatType.SEARCH; - } - if ("labels".equals(type)) { + case "labels": return FormatType.LABEL; - } - if ("popular-words".equals(type)) { + case "popular-words": return FormatType.POPULARWORD; - } - if ("favorites".equals(type)) { + case "favorites": return FormatType.FAVORITES; - } - if ("health".equals(type)) { + case "health": return FormatType.PING; - } - if ("suggest-words".equals(type)) { + case "suggest-words": return FormatType.SUGGEST; + default: + break; } // default return FormatType.OTHER; @@ -1247,8 +1245,8 @@ protected String escapeJson(final Object obj) { buf.append(escapeJson(entry.getKey())).append(':').append(escapeJson(entry.getValue())); } buf.append('}'); - } else if ((obj instanceof Integer) || (obj instanceof Long) || (obj instanceof Float) || (obj instanceof Double)) { - buf.append((obj)); + } else if (obj instanceof Integer || obj instanceof Long || obj instanceof Float || obj instanceof Double) { + buf.append(obj); } else if (obj instanceof Boolean) { buf.append(obj.toString()); } else if (obj instanceof Date) { 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 b238a07d1a..ca2a8abf31 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 @@ -319,17 +319,17 @@ public ActionResponse download(final String id) { } if (id.endsWith(NDJSON_EXTENTION)) { final String name = id.substring(0, id.length() - NDJSON_EXTENTION.length()); - if ("search_log".equals(name)) { + switch (name) { + case "search_log": return writeNdjsonResponse(id, getSearchLogNdjsonWriteCall()); - } - if ("user_info".equals(name)) { + case "user_info": return writeNdjsonResponse(id, getUserInfoNdjsonWriteCall()); - } - if ("click_log".equals(name)) { + case "click_log": return writeNdjsonResponse(id, getClickLogNdjsonWriteCall()); - } - if ("favorite_log".equals(name)) { + case "favorite_log": return writeNdjsonResponse(id, getFavoriteLogNdjsonWriteCall()); + default: + break; } } else if ("fess.json".equals(id)) { return asStream(id).contentTypeOctetStream().stream(out -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java b/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java index 2a6e171954..ee9a9a6a58 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import java.util.regex.Pattern; import org.apache.commons.io.FileUtils; import org.apache.logging.log4j.LogManager; @@ -359,12 +358,12 @@ private HtmlResponse asEditHtml(final EditForm form) { public static String decodeJsp(final String value) { return value.replaceAll("<%(?![@-])([\\s\\S]*?)%>", "<%$1%>").replaceAll("<%=([\\s\\S]*?)%>", "<%=$1%>") - .replaceAll(TRY_STATEMENT, "<% try{ %>") - .replaceAll(CACHE_AND_SESSION_INVALIDATE_STATEMENT, "<% }catch(Exception e){session.invalidate();} %>"); + .replace(TRY_STATEMENT, "<% try{ %>") + .replace(CACHE_AND_SESSION_INVALIDATE_STATEMENT, "<% }catch(Exception e){session.invalidate();} %>"); } public static String encodeJsp(final String value) { - return value.replaceAll(Pattern.quote("<% try{ %>"), TRY_STATEMENT) - .replaceAll(Pattern.quote("<% }catch(Exception e){session.invalidate();} %>"), CACHE_AND_SESSION_INVALIDATE_STATEMENT); + return value.replace("<% try{ %>", TRY_STATEMENT).replace("<% }catch(Exception e){session.invalidate();} %>", + CACHE_AND_SESSION_INVALIDATE_STATEMENT); } } 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 221e80df56..d04c1223f0 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 @@ -304,8 +304,8 @@ protected boolean startReindex(final boolean replaceAliases, final boolean reset if (searchEngineClient.createIndex(docIndex, toIndex, numberOfShards, autoExpandReplicas, resetDictionaries)) { searchEngineClient.admin().cluster().prepareHealth(toIndex).setWaitForYellowStatus().execute(ActionListener.wrap(response -> { searchEngineClient.addMapping(docIndex, "doc", toIndex); - if (searchEngineClient.copyDocIndex(fromIndex, toIndex, replaceAliases) - && (replaceAliases && !searchEngineClient.updateAlias(toIndex))) { + if (searchEngineClient.copyDocIndex(fromIndex, toIndex, replaceAliases) && replaceAliases + && !searchEngineClient.updateAlias(toIndex)) { logger.warn("Failed to update aliases for {} and {}", fromIndex, toIndex); } }, e -> logger.warn("Failed to reindex from {} to {}", fromIndex, toIndex, e))); 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 9b9c6ac4e1..ca520826db 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 @@ -144,12 +144,18 @@ public HtmlResponse createnewjob(final String type, final String id, final Strin final String decodedName = new String(Base64.getUrlDecoder().decode(name), Constants.CHARSET_UTF_8); scheduledJobForm.name = MessageFormat.format(fessConfig.getJobTemplateTitle(type), decodedName); final String[] ids = { "", "", "" }; - if (Constants.WEB_CRAWLER_TYPE.equals(type)) { + switch (type) { + case Constants.WEB_CRAWLER_TYPE: ids[0] = "\"" + id + "\""; - } else if (Constants.FILE_CRAWLER_TYPE.equals(type)) { + break; + case Constants.FILE_CRAWLER_TYPE: ids[1] = "\"" + id + "\""; - } else if (Constants.DATA_CRAWLER_TYPE.equals(type)) { + break; + case Constants.DATA_CRAWLER_TYPE: ids[2] = "\"" + id + "\""; + break; + default: + break; } scheduledJobForm.scriptData = MessageFormat.format(fessConfig.getJobTemplateScript(), ids[0], ids[1], ids[2], id.replace('-', '_')); 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 914d6c3396..993441aa99 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 @@ -114,6 +114,18 @@ public class AdminUpgradeAction extends FessAdminAction { private static final String VERSION_14_10 = "14.10"; + private static final String VERSION_14_11 = "14.11"; + + private static final String VERSION_14_12 = "14.12"; + + private static final String VERSION_14_13 = "14.13"; + + private static final String VERSION_14_14 = "14.14"; + + private static final String VERSION_14_15 = "14.15"; + + private static final String VERSION_14_16 = "14.16"; + // =================================================================================== // Attribute // @@ -179,7 +191,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { validate(form, messages -> {}, this::asIndexHtml); verifyToken(this::asIndexHtml); - if (VERSION_13_0.equals(form.targetVersion)) { + switch (form.targetVersion) { + case VERSION_13_0: try { upgradeFrom13_0(); upgradeFrom13_1(); @@ -209,6 +222,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -218,7 +237,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_0, e.getLocalizedMessage())); } - } else if (VERSION_13_1.equals(form.targetVersion)) { + break; + case VERSION_13_1: try { upgradeFrom13_1(); upgradeFrom13_2(); @@ -248,6 +268,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -257,7 +283,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_1, e.getLocalizedMessage())); } - } else if (VERSION_13_2.equals(form.targetVersion)) { + break; + case VERSION_13_2: try { upgradeFrom13_2(); upgradeFrom13_3(); @@ -286,6 +313,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -295,7 +328,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_2, e.getLocalizedMessage())); } - } else if (VERSION_13_3.equals(form.targetVersion)) { + break; + case VERSION_13_3: try { upgradeFrom13_3(); upgradeFrom13_4(); @@ -323,6 +357,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -332,7 +372,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_3, e.getLocalizedMessage())); } - } else if (VERSION_13_4.equals(form.targetVersion)) { + break; + case VERSION_13_4: try { upgradeFrom13_4(); upgradeFrom13_5(); @@ -359,6 +400,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -368,7 +415,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_4, e.getLocalizedMessage())); } - } else if (VERSION_13_5.equals(form.targetVersion)) { + break; + case VERSION_13_5: try { upgradeFrom13_5(); upgradeFrom13_6(); @@ -394,6 +442,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -403,7 +457,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_5, e.getLocalizedMessage())); } - } else if (VERSION_13_6.equals(form.targetVersion)) { + break; + case VERSION_13_6: try { upgradeFrom13_6(); upgradeFrom13_7(); @@ -428,6 +483,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -437,7 +498,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_6, e.getLocalizedMessage())); } - } else if (VERSION_13_7.equals(form.targetVersion)) { + break; + case VERSION_13_7: try { upgradeFrom13_7(); upgradeFrom13_8(); @@ -461,6 +523,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -470,7 +538,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_7, e.getLocalizedMessage())); } - } else if (VERSION_13_8.equals(form.targetVersion)) { + break; + case VERSION_13_8: try { upgradeFrom13_8(); upgradeFrom13_9(); @@ -493,6 +562,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -502,7 +577,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_8, e.getLocalizedMessage())); } - } else if (VERSION_13_9.equals(form.targetVersion)) { + break; + case VERSION_13_9: try { upgradeFrom13_9(); upgradeFrom13_10(); @@ -524,6 +600,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -533,7 +615,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_9, e.getLocalizedMessage())); } - } else if (VERSION_13_10.equals(form.targetVersion)) { + break; + case VERSION_13_10: try { upgradeFrom13_10(); upgradeFrom13_11(); @@ -554,6 +637,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -563,7 +652,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_10, e.getLocalizedMessage())); } - } else if (VERSION_13_11.equals(form.targetVersion)) { + break; + case VERSION_13_11: try { upgradeFrom13_11(); upgradeFrom13_12(); @@ -582,6 +672,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -591,7 +687,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_11, e.getLocalizedMessage())); } - } else if (VERSION_13_12.equals(form.targetVersion)) { + break; + case VERSION_13_12: try { upgradeFrom13_12(); upgradeFrom13_13(); @@ -609,6 +706,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -618,7 +721,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_12, e.getLocalizedMessage())); } - } else if (VERSION_13_13.equals(form.targetVersion)) { + break; + case VERSION_13_13: try { upgradeFrom13_13(); upgradeFrom13_14(); @@ -635,6 +739,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -644,7 +754,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_13, e.getLocalizedMessage())); } - } else if (VERSION_13_14.equals(form.targetVersion)) { + break; + case VERSION_13_14: try { upgradeFrom13_14(); upgradeFrom13_15(); @@ -660,6 +771,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -669,7 +786,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_14, e.getLocalizedMessage())); } - } else if (VERSION_13_15.equals(form.targetVersion)) { + break; + case VERSION_13_15: try { upgradeFrom13_15(); upgradeFrom13_16(); @@ -685,6 +803,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -694,7 +818,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_15, e.getLocalizedMessage())); } - } else if (VERSION_13_16.equals(form.targetVersion)) { + break; + case VERSION_13_16: try { upgradeFrom13_16(); upgradeFrom13_17(); @@ -709,6 +834,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -718,7 +849,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_16, e.getLocalizedMessage())); } - } else if (VERSION_13_17.equals(form.targetVersion)) { + break; + case VERSION_13_17: try { upgradeFrom13_17(); upgradeFrom14_0(); @@ -732,6 +864,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -741,7 +879,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_17, e.getLocalizedMessage())); } - } else if (VERSION_14_0.equals(form.targetVersion)) { + break; + case VERSION_14_0: try { upgradeFrom14_0(); upgradeFrom14_1(); @@ -754,6 +893,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -763,7 +908,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_0, e.getLocalizedMessage())); } - } else if (VERSION_14_1.equals(form.targetVersion)) { + break; + case VERSION_14_1: try { upgradeFrom14_1(); upgradeFrom14_2(); @@ -775,6 +921,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -784,7 +936,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_1, e.getLocalizedMessage())); } - } else if (VERSION_14_2.equals(form.targetVersion)) { + break; + case VERSION_14_2: try { upgradeFrom14_2(); upgradeFrom14_3(); @@ -795,6 +948,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -804,7 +963,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_2, e.getLocalizedMessage())); } - } else if (VERSION_14_3.equals(form.targetVersion)) { + break; + case VERSION_14_3: try { upgradeFrom14_3(); upgradeFrom14_4(); @@ -814,6 +974,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -823,7 +989,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_3, e.getLocalizedMessage())); } - } else if (VERSION_14_4.equals(form.targetVersion)) { + break; + case VERSION_14_4: try { upgradeFrom14_4(); upgradeFrom14_5(); @@ -832,6 +999,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -841,7 +1014,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_4, e.getLocalizedMessage())); } - } else if (VERSION_14_5.equals(form.targetVersion)) { + break; + case VERSION_14_5: try { upgradeFrom14_5(); upgradeFrom14_6(); @@ -849,6 +1023,12 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -858,13 +1038,20 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_5, e.getLocalizedMessage())); } - } else if (VERSION_14_6.equals(form.targetVersion)) { + break; + case VERSION_14_6: try { upgradeFrom14_6(); upgradeFrom14_7(); upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -874,12 +1061,19 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_6, e.getLocalizedMessage())); } - } else if (VERSION_14_7.equals(form.targetVersion)) { + break; + case VERSION_14_7: try { upgradeFrom14_7(); upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -889,11 +1083,18 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_7, e.getLocalizedMessage())); } - } else if (VERSION_14_8.equals(form.targetVersion)) { + break; + case VERSION_14_8: try { upgradeFrom14_8(); upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -903,10 +1104,17 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_8, e.getLocalizedMessage())); } - } else if (VERSION_14_9.equals(form.targetVersion)) { + break; + case VERSION_14_9: try { upgradeFrom14_9(); upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -916,9 +1124,16 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_9, e.getLocalizedMessage())); } - } else if (VERSION_14_10.equals(form.targetVersion)) { + break; + case VERSION_14_10: try { upgradeFrom14_10(); + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -928,8 +1143,103 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_10, e.getLocalizedMessage())); } - } else { + break; + case VERSION_14_11: + try { + upgradeFrom14_11(); + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); + upgradeFromAll(); + + saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); + + systemHelper.reloadConfiguration(); + } catch (final Exception e) { + logger.warn("Failed to upgrade data.", e); + saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_11, e.getLocalizedMessage())); + } + break; + case VERSION_14_12: + try { + upgradeFrom14_12(); + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); + upgradeFromAll(); + + saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); + + systemHelper.reloadConfiguration(); + } catch (final Exception e) { + logger.warn("Failed to upgrade data.", e); + saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_12, e.getLocalizedMessage())); + } + break; + case VERSION_14_13: + try { + upgradeFrom14_13(); + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); + upgradeFromAll(); + + saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); + + systemHelper.reloadConfiguration(); + } catch (final Exception e) { + logger.warn("Failed to upgrade data.", e); + saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_13, e.getLocalizedMessage())); + } + break; + case VERSION_14_14: + try { + upgradeFrom14_14(); + upgradeFrom14_15(); + upgradeFrom14_16(); + upgradeFromAll(); + + saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); + + systemHelper.reloadConfiguration(); + } catch (final Exception e) { + logger.warn("Failed to upgrade data.", e); + saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_14, e.getLocalizedMessage())); + } + break; + case VERSION_14_15: + try { + upgradeFrom14_15(); + upgradeFrom14_16(); + upgradeFromAll(); + + saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); + + systemHelper.reloadConfiguration(); + } catch (final Exception e) { + logger.warn("Failed to upgrade data.", e); + saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_15, e.getLocalizedMessage())); + } + break; + case VERSION_14_16: + try { + upgradeFrom14_16(); + upgradeFromAll(); + + saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); + + systemHelper.reloadConfiguration(); + } catch (final Exception e) { + logger.warn("Failed to upgrade data.", e); + saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_16, e.getLocalizedMessage())); + } + break; + default: saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL)); + break; } return redirect(getClass()); } @@ -1143,6 +1453,30 @@ private void upgradeFrom14_10() { // nothing } + private void upgradeFrom14_11() { + // nothing + } + + private void upgradeFrom14_12() { + // nothing + } + + private void upgradeFrom14_13() { + // nothing + } + + private void upgradeFrom14_14() { + // nothing + } + + private void upgradeFrom14_15() { + // nothing + } + + private void upgradeFrom14_16() { + // nothing + } + private String[] getDictionaryPaths() { try (CurlResponse response = ComponentUtil.getCurlHelper().get("/_configsync/file").param("size", "1000").execute()) { if (response.getHttpStatusCode() == 200) { @@ -1195,4 +1529,4 @@ private void upgradeFromAll() { // nothing } -} +} \ No newline at end of file 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 c665692368..e27a776fdf 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 @@ -120,7 +120,7 @@ public static class ApiConfigsResponse extends ApiResponse { public ApiConfigsResponse settings(final List settings) { this.settings = settings; - this.total = settings.size(); + total = settings.size(); return this; } 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 b373f1a0dc..c21a0adf52 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 @@ -102,17 +102,17 @@ public JsonResponse files() { }); } final String name = id.substring(0, id.length() - NDJSON_EXTENTION.length()); - if ("search_log".equals(name)) { + switch (name) { + case "search_log": return writeNdjsonResponse(id, getSearchLogNdjsonWriteCall()); - } - if ("user_info".equals(name)) { + case "user_info": return writeNdjsonResponse(id, getUserInfoNdjsonWriteCall()); - } - if ("click_log".equals(name)) { + case "click_log": return writeNdjsonResponse(id, getClickLogNdjsonWriteCall()); - } - if ("favorite_log".equals(name)) { + case "favorite_log": return writeNdjsonResponse(id, getFavoriteLogNdjsonWriteCall()); + default: + break; } } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/SearchBody.java index 2e11376ef2..1fc7930951 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/SearchBody.java @@ -28,7 +28,7 @@ public class SearchBody extends ListForm { @Override public void initialize() { if (size != null) { - num = (num == null || num < size) ? size : num; + num = num == null || num < size ? size : num; } super.initialize(); } diff --git a/src/main/java/org/codelibs/fess/app/web/base/login/OpenIdConnectCredential.java b/src/main/java/org/codelibs/fess/app/web/base/login/OpenIdConnectCredential.java index c27248367d..035593a179 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/login/OpenIdConnectCredential.java +++ b/src/main/java/org/codelibs/fess/app/web/base/login/OpenIdConnectCredential.java @@ -26,6 +26,7 @@ import org.codelibs.fess.entity.FessUser; import org.codelibs.fess.helper.SystemHelper; import org.codelibs.fess.util.ComponentUtil; +import org.codelibs.fess.util.DocumentUtil; import org.lastaflute.web.login.credential.LoginCredential; public class OpenIdConnectCredential implements LoginCredential, FessCredential { @@ -43,15 +44,15 @@ public String toString() { @Override public String getUserId() { - return (String) attributes.get("email"); + return DocumentUtil.getValue(attributes, "email", String.class); } public String[] getUserGroups() { - String[] userGroups = (String[]) attributes.get("groups"); + String[] userGroups = DocumentUtil.getValue(attributes, "groups", String[].class); if (userGroups == null) { userGroups = getDefaultGroupsAsArray(); } - return (userGroups); + return userGroups; } public OpenIdUser getUser() { 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 af0fce7f48..7c24bf2dbe 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java @@ -222,8 +222,8 @@ protected Map generateData(final ResponseData responseData) { responseData.addMetaData(Extractor.class.getSimpleName(), extractor); final String body = documentHelper.getContent(crawlingConfig, responseData, bodyBase, dataMap); putResultDataBody(dataMap, fessConfig.getIndexFieldContent(), body); - if ((fieldConfigs.getConfig(fessConfig.getIndexFieldCache()).map(config -> config.isCache()).orElse(false) - || fessConfig.isCrawlerDocumentCacheEnabled()) && fessConfig.isSupportedDocumentCacheMimetypes(mimeType)) { + if ((fieldConfigs.getConfig(fessConfig.getIndexFieldCache()).map(org.codelibs.fess.crawler.util.FieldConfigs.Config::isCache) + .orElse(false) || fessConfig.isCrawlerDocumentCacheEnabled()) && fessConfig.isSupportedDocumentCacheMimetypes(mimeType)) { if (responseData.getContentLength() > 0 && responseData.getContentLength() <= fessConfig.getCrawlerDocumentCacheMaxSizeAsInteger().longValue()) { @@ -348,7 +348,7 @@ protected Date getLastModified(final Map dataMap, final Response if (lastModified != null) { return lastModified; } - } else if ((lastModifiedObj instanceof final String[] lastModifieds) && (lastModifieds.length > 0)) { + } else if (lastModifiedObj instanceof final String[] lastModifieds && lastModifieds.length > 0) { final Date lastModified = FessFunctions.parseDate(lastModifieds[0]); if (lastModified != null) { return lastModified; diff --git a/src/main/java/org/codelibs/fess/crawler/transformer/FessTransformer.java b/src/main/java/org/codelibs/fess/crawler/transformer/FessTransformer.java index 77430ebe99..babb3c1e8e 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/FessTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/FessTransformer.java @@ -88,8 +88,8 @@ default String getSite(final String u, final String encoding) { if (encoding != null) { String enc; if (StringUtil.isNotBlank(getFessConfig().getCrawlerDocumentSiteEncoding()) - && (!getFessConfig().isCrawlerDocumentUseSiteEncodingOnEnglish() - || ("ISO-8859-1".equalsIgnoreCase(encoding) || "US-ASCII".equalsIgnoreCase(encoding)))) { + && (!getFessConfig().isCrawlerDocumentUseSiteEncodingOnEnglish() || "ISO-8859-1".equalsIgnoreCase(encoding) + || "US-ASCII".equalsIgnoreCase(encoding))) { enc = getFessConfig().getCrawlerDocumentSiteEncoding(); } else { enc = encoding; @@ -253,9 +253,9 @@ default String getParentEncoding(final String parentUrl, final String sessionId) default Map processFieldConfigs(final Map dataMap, final FieldConfigs fieldConfigs) { final Map newDataMap = new LinkedHashMap<>(); - for (Map.Entry e : dataMap.entrySet()) { + for (final Map.Entry e : dataMap.entrySet()) { if (fieldConfigs.getConfig(e.getKey()).map(FieldConfigs.Config::isOverwrite).orElse(false) - && e.getValue() instanceof Object[] values && values.length > 0) { + && e.getValue() instanceof final Object[] values && values.length > 0) { newDataMap.put(e.getKey(), values[values.length - 1]); } else { newDataMap.put(e.getKey(), e.getValue()); 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 92d31ec0a2..40f6bedaa6 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java @@ -397,8 +397,8 @@ && isValidCanonicalUrl(responseData.getUrl(), canonicalUrl)) { prunedContent ? node -> pruneNode(node, crawlingConfig) : node -> node); final String fileName = getFileName(url, urlEncoding); putResultDataContent(dataMap, responseData, fessConfig, crawlingConfig, documentHelper, body, fileName); - if ((fieldConfigs.getConfig(fessConfig.getIndexFieldCache()).map(config -> config.isCache()).orElse(false) - || fessConfig.isCrawlerDocumentCacheEnabled()) && fessConfig.isSupportedDocumentCacheMimetypes(mimeType)) { + if ((fieldConfigs.getConfig(fessConfig.getIndexFieldCache()).map(org.codelibs.fess.crawler.util.FieldConfigs.Config::isCache) + .orElse(false) || fessConfig.isCrawlerDocumentCacheEnabled()) && fessConfig.isSupportedDocumentCacheMimetypes(mimeType)) { if (responseData.getContentLength() > 0 && responseData.getContentLength() <= fessConfig.getCrawlerDocumentCacheMaxSizeAsInteger().longValue()) { String charSet = responseData.getCharSet(); @@ -978,6 +978,6 @@ public void setConvertUrlMap(final Map convertUrlMap) { } public void addConvertUrl(final String regex, final String replacement) { - this.convertUrlMap.put(regex, replacement); + convertUrlMap.put(regex, replacement); } } diff --git a/src/main/java/org/codelibs/fess/crawler/util/FieldConfigs.java b/src/main/java/org/codelibs/fess/crawler/util/FieldConfigs.java index 112819466b..368efd847d 100644 --- a/src/main/java/org/codelibs/fess/crawler/util/FieldConfigs.java +++ b/src/main/java/org/codelibs/fess/crawler/util/FieldConfigs.java @@ -27,12 +27,12 @@ public class FieldConfigs { private final Map params; - public FieldConfigs(Map params) { + public FieldConfigs(final Map params) { this.params = params; } - public OptionalThing getConfig(String fieldName) { - String value = params.get(fieldName); + public OptionalThing getConfig(final String fieldName) { + final String value = params.get(fieldName); if (StringUtil.isNotBlank(value)) { return OptionalThing.of(new Config(value)); } @@ -43,8 +43,8 @@ public static class Config { private final String[] values; - public Config(String value) { - values = StreamUtil.split(value, Pattern.quote("|")).get(stream -> stream.map(s -> s.trim()).toArray(n -> new String[n])); + public Config(final String value) { + values = StreamUtil.split(value, Pattern.quote("|")).get(stream -> stream.map(String::trim).toArray(n -> new String[n])); } public boolean isCache() { diff --git a/src/main/java/org/codelibs/fess/dict/DictionaryFile.java b/src/main/java/org/codelibs/fess/dict/DictionaryFile.java index 379582a3ee..194ae1a71c 100644 --- a/src/main/java/org/codelibs/fess/dict/DictionaryFile.java +++ b/src/main/java/org/codelibs/fess/dict/DictionaryFile.java @@ -94,7 +94,7 @@ public static class PagingList implements List { protected int pageRangeSize; public PagingList(final List list, final int offset, final int size, final int allRecordCount) { - this.parent = list; + parent = list; this.allRecordCount = allRecordCount; pageSize = size; currentPageNumber = offset / size + 1; diff --git a/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiFile.java b/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiFile.java index b8dd1a7436..733c41f898 100644 --- a/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiFile.java +++ b/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiFile.java @@ -222,7 +222,7 @@ protected KuromojiUpdater(final KuromojiItem newItem) { public KuromojiItem write(final KuromojiItem oldItem) { try { - if ((item == null) || (item.getId() != oldItem.getId()) || !item.isUpdated()) { + if (item == null || item.getId() != oldItem.getId() || !item.isUpdated()) { writer.write(oldItem.toLineString()); writer.write(Constants.LINE_SEPARATOR); return oldItem; diff --git a/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiItem.java b/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiItem.java index 14be01eace..6394ade632 100644 --- a/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiItem.java +++ b/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiItem.java @@ -118,7 +118,7 @@ public boolean equals(final Object obj) { if (this == obj) { return true; } - if ((obj == null) || (getClass() != obj.getClass())) { + if (obj == null || getClass() != obj.getClass()) { return false; } final KuromojiItem other = (KuromojiItem) obj; diff --git a/src/main/java/org/codelibs/fess/dict/mapping/CharMappingFile.java b/src/main/java/org/codelibs/fess/dict/mapping/CharMappingFile.java index b063a956aa..2b789430c0 100644 --- a/src/main/java/org/codelibs/fess/dict/mapping/CharMappingFile.java +++ b/src/main/java/org/codelibs/fess/dict/mapping/CharMappingFile.java @@ -236,7 +236,7 @@ protected MappingUpdater(final CharMappingItem newItem) { public CharMappingItem write(final CharMappingItem oldItem) { try { - if ((item == null) || (item.getId() != oldItem.getId()) || !item.isUpdated()) { + if (item == null || item.getId() != oldItem.getId() || !item.isUpdated()) { writer.write(oldItem.toLineString()); writer.write(Constants.LINE_SEPARATOR); return oldItem; diff --git a/src/main/java/org/codelibs/fess/dict/mapping/CharMappingItem.java b/src/main/java/org/codelibs/fess/dict/mapping/CharMappingItem.java index c613332a24..7a9daa4a01 100644 --- a/src/main/java/org/codelibs/fess/dict/mapping/CharMappingItem.java +++ b/src/main/java/org/codelibs/fess/dict/mapping/CharMappingItem.java @@ -102,7 +102,7 @@ public boolean equals(final Object obj) { if (this == obj) { return true; } - if ((obj == null) || (getClass() != obj.getClass())) { + if (obj == null || getClass() != obj.getClass()) { return false; } final CharMappingItem other = (CharMappingItem) obj; diff --git a/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsFile.java b/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsFile.java index d50e317438..f5d31a147d 100644 --- a/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsFile.java +++ b/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsFile.java @@ -221,7 +221,7 @@ protected ProtwordsUpdater(final ProtwordsItem newItem) { public ProtwordsItem write(final ProtwordsItem oldItem) { try { - if ((item == null) || (item.getId() != oldItem.getId()) || !item.isUpdated()) { + if (item == null || item.getId() != oldItem.getId() || !item.isUpdated()) { writer.write(oldItem.toLineString()); writer.write(Constants.LINE_SEPARATOR); return oldItem; diff --git a/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsItem.java b/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsItem.java index 0808913bac..81c0bebaca 100644 --- a/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsItem.java +++ b/src/main/java/org/codelibs/fess/dict/protwords/ProtwordsItem.java @@ -73,7 +73,7 @@ public boolean equals(final Object obj) { if (this == obj) { return true; } - if ((obj == null) || (getClass() != obj.getClass())) { + if (obj == null || getClass() != obj.getClass()) { return false; } final ProtwordsItem other = (ProtwordsItem) obj; diff --git a/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideFile.java b/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideFile.java index 040cc97b90..ab6a71ea3a 100644 --- a/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideFile.java +++ b/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideFile.java @@ -233,7 +233,7 @@ protected StemmerOverrideUpdater(final StemmerOverrideItem newItem) { public StemmerOverrideItem write(final StemmerOverrideItem oldItem) { try { - if ((item == null) || (item.getId() != oldItem.getId()) || !item.isUpdated()) { + if (item == null || item.getId() != oldItem.getId() || !item.isUpdated()) { writer.write(oldItem.toLineString()); writer.write(Constants.LINE_SEPARATOR); return oldItem; diff --git a/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideItem.java b/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideItem.java index c5509b7134..3a26278e69 100644 --- a/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideItem.java +++ b/src/main/java/org/codelibs/fess/dict/stemmeroverride/StemmerOverrideItem.java @@ -54,7 +54,7 @@ public String getNewOutput() { } public void setNewOutput(final String newOutputs) { - this.newOutput = newOutputs; + newOutput = newOutputs; } public String getInput() { @@ -83,7 +83,7 @@ public boolean equals(final Object obj) { if (this == obj) { return true; } - if ((obj == null) || (getClass() != obj.getClass())) { + if (obj == null || getClass() != obj.getClass()) { return false; } final StemmerOverrideItem other = (StemmerOverrideItem) obj; diff --git a/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsFile.java b/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsFile.java index 10f6ae67f9..2f0b4aeb53 100644 --- a/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsFile.java +++ b/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsFile.java @@ -221,7 +221,7 @@ protected SynonymUpdater(final StopwordsItem newItem) { public StopwordsItem write(final StopwordsItem oldItem) { try { - if ((item == null) || (item.getId() != oldItem.getId()) || !item.isUpdated()) { + if (item == null || item.getId() != oldItem.getId() || !item.isUpdated()) { writer.write(oldItem.toLineString()); writer.write(Constants.LINE_SEPARATOR); return oldItem; diff --git a/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsItem.java b/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsItem.java index 7b6b49632c..b4f5f4d626 100644 --- a/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsItem.java +++ b/src/main/java/org/codelibs/fess/dict/stopwords/StopwordsItem.java @@ -73,7 +73,7 @@ public boolean equals(final Object obj) { if (this == obj) { return true; } - if ((obj == null) || (getClass() != obj.getClass())) { + if (obj == null || getClass() != obj.getClass()) { return false; } final StopwordsItem other = (StopwordsItem) obj; diff --git a/src/main/java/org/codelibs/fess/dict/synonym/SynonymFile.java b/src/main/java/org/codelibs/fess/dict/synonym/SynonymFile.java index fa6d861fdc..676b2a0023 100644 --- a/src/main/java/org/codelibs/fess/dict/synonym/SynonymFile.java +++ b/src/main/java/org/codelibs/fess/dict/synonym/SynonymFile.java @@ -297,7 +297,7 @@ protected SynonymUpdater(final SynonymItem newItem) { public SynonymItem write(final SynonymItem oldItem) { try { - if ((item == null) || (item.getId() != oldItem.getId()) || !item.isUpdated()) { + if (item == null || item.getId() != oldItem.getId() || !item.isUpdated()) { writer.write(oldItem.toLineString()); writer.write(Constants.LINE_SEPARATOR); return oldItem; diff --git a/src/main/java/org/codelibs/fess/dict/synonym/SynonymItem.java b/src/main/java/org/codelibs/fess/dict/synonym/SynonymItem.java index 10cf67a694..82a4b03593 100644 --- a/src/main/java/org/codelibs/fess/dict/synonym/SynonymItem.java +++ b/src/main/java/org/codelibs/fess/dict/synonym/SynonymItem.java @@ -100,7 +100,7 @@ public boolean equals(final Object obj) { if (this == obj) { return true; } - if ((obj == null) || (getClass() != obj.getClass())) { + if (obj == null || getClass() != obj.getClass()) { return false; } final SynonymItem other = (SynonymItem) obj; diff --git a/src/main/java/org/codelibs/fess/entity/HighlightInfo.java b/src/main/java/org/codelibs/fess/entity/HighlightInfo.java index 814c416a7a..207bb9cf48 100644 --- a/src/main/java/org/codelibs/fess/entity/HighlightInfo.java +++ b/src/main/java/org/codelibs/fess/entity/HighlightInfo.java @@ -26,10 +26,10 @@ public class HighlightInfo { public HighlightInfo() { final FessConfig fessConfig = ComponentUtil.getFessConfig(); - this.type = fessConfig.getQueryHighlightType(); - this.fragmentSize = fessConfig.getQueryHighlightFragmentSizeAsInteger(); - this.numOfFragments = fessConfig.getQueryHighlightNumberOfFragmentsAsInteger(); - this.fragmentOffset = fessConfig.getQueryHighlightFragmentOffsetAsInteger(); + type = fessConfig.getQueryHighlightType(); + fragmentSize = fessConfig.getQueryHighlightFragmentSizeAsInteger(); + numOfFragments = fessConfig.getQueryHighlightNumberOfFragmentsAsInteger(); + fragmentOffset = fessConfig.getQueryHighlightFragmentOffsetAsInteger(); } public String getType() { diff --git a/src/main/java/org/codelibs/fess/entity/QueryContext.java b/src/main/java/org/codelibs/fess/entity/QueryContext.java index ff770767e7..9427552496 100644 --- a/src/main/java/org/codelibs/fess/entity/QueryContext.java +++ b/src/main/java/org/codelibs/fess/entity/QueryContext.java @@ -61,10 +61,10 @@ public class QueryContext { public QueryContext(final String queryString, final boolean isQuery) { if (queryString != null) { if (queryString.startsWith(ALLINURL_FIELD_PREFIX)) { - this.defaultField = ComponentUtil.getFessConfig().getIndexFieldUrl(); + defaultField = ComponentUtil.getFessConfig().getIndexFieldUrl(); this.queryString = queryString.substring(ALLINURL_FIELD_PREFIX.length()); } else if (queryString.startsWith(ALLINTITLE_FIELD_PREFIX)) { - this.defaultField = ComponentUtil.getFessConfig().getIndexFieldTitle(); + defaultField = ComponentUtil.getFessConfig().getIndexFieldTitle(); this.queryString = queryString.substring(ALLINTITLE_FIELD_PREFIX.length()); } else { this.queryString = queryString; diff --git a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java b/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java index ff0166721e..360b74428a 100644 --- a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java +++ b/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java @@ -248,11 +248,11 @@ public void setRunner(final OpenSearchRunner runner) { } public boolean isEmbedded() { - return this.runner != null; + return runner != null; } public void usePipeline() { - this.usePipeline = true; + usePipeline = true; } protected InetAddress getInetAddressByName(final String host) { @@ -283,7 +283,7 @@ public void open() { } String httpAddress = SystemUtil.getSearchEngineHttpAddress(); - if (StringUtil.isBlank(httpAddress) && (runner == null)) { + if (StringUtil.isBlank(httpAddress) && runner == null) { switch (fessConfig.getFesenType()) { case Constants.FESEN_TYPE_CLOUD: case Constants.FESEN_TYPE_AWS: @@ -752,43 +752,42 @@ protected void insertBulkData(final FessConfig fessConfig, final String configIn final BulkRequestBuilder builder = client.prepareBulk(); final ObjectMapper mapper = new ObjectMapper(); final String userIndex = fessConfig.getIndexUserIndex() + ".user"; - Arrays.stream(FileUtil.readUTF8(dataPath).split("\n")).map(line -> { - return line// - .replace("\"_index\":\"fess_config.", "\"_index\":\"" + fessConfig.getIndexConfigIndex() + ".")// - .replace("\"_index\":\"fess_user.", "\"_index\":\"" + fessConfig.getIndexUserIndex() + ".")// - .replace("\"_index\":\"fess_log.", "\"_index\":\"" + fessConfig.getIndexLogIndex() + "."); - }).reduce((prev, line) -> { - try { - if (StringUtil.isBlank(prev)) { - final Map> result = - mapper.readValue(line, new TypeReference>>() { - }); - if (result.containsKey("index") || result.containsKey("update")) { - return line; - } - if (result.containsKey("delete")) { - return StringUtil.EMPTY; - } - } else { - final Map> result = - mapper.readValue(prev, new TypeReference>>() { - }); - if (result.containsKey("index")) { - String source = line; - if (userIndex.equals(configIndex)) { - source = source.replace("${fess.index.initial_password}", ComponentUtil.getComponent(FessLoginAssist.class) - .encryptPassword(fessConfig.getIndexUserInitialPassword())); + Arrays.stream(FileUtil.readUTF8(dataPath).split("\n")).map(line -> line// + .replace("\"_index\":\"fess_config.", "\"_index\":\"" + fessConfig.getIndexConfigIndex() + ".")// + .replace("\"_index\":\"fess_user.", "\"_index\":\"" + fessConfig.getIndexUserIndex() + ".")// + .replace("\"_index\":\"fess_log.", "\"_index\":\"" + fessConfig.getIndexLogIndex() + ".")).reduce((prev, line) -> { + try { + if (StringUtil.isBlank(prev)) { + final Map> result = + mapper.readValue(line, new TypeReference>>() { + }); + if (result.containsKey("index") || result.containsKey("update")) { + return line; + } + if (result.containsKey("delete")) { + return StringUtil.EMPTY; + } + } else { + final Map> result = + mapper.readValue(prev, new TypeReference>>() { + }); + if (result.containsKey("index")) { + String source = line; + if (userIndex.equals(configIndex)) { + source = source.replace("${fess.index.initial_password}", + ComponentUtil.getComponent(FessLoginAssist.class) + .encryptPassword(fessConfig.getIndexUserInitialPassword())); + } + final IndexRequestBuilder requestBuilder = client.prepareIndex().setIndex(configIndex) + .setId(result.get("index").get("_id")).setSource(source, XContentType.JSON); + builder.add(requestBuilder); + } } - final IndexRequestBuilder requestBuilder = client.prepareIndex().setIndex(configIndex) - .setId(result.get("index").get("_id")).setSource(source, XContentType.JSON); - builder.add(requestBuilder); + } catch (final Exception e) { + logger.warn("Failed to parse {}", dataPath); } - } - } catch (final Exception e) { - logger.warn("Failed to parse {}", dataPath); - } - return StringUtil.EMPTY; - }); + return StringUtil.EMPTY; + }); final BulkResponse response = builder.execute().actionGet(fessConfig.getIndexBulkTimeout()); if (response.hasFailures()) { logger.warn("Failed to register {}: {}", dataPath, response.buildFailureMessage()); @@ -1327,7 +1326,7 @@ public SearchConditionBuilder facetInfo(final FacetInfo facetInfo) { } public SearchConditionBuilder scroll() { - this.isScroll = true; + isScroll = true; return this; } 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 548a61bbe4..d0a3c26e2a 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 @@ -299,21 +299,30 @@ public CrawlerClientFactory initializeClientFactory(final Supplier paramMap, final String webAuthName, final String scheme) { AuthScheme authScheme = null; - if (Constants.BASIC.equals(scheme)) { + switch (scheme) { + case Constants.BASIC: authScheme = new BasicScheme(); - } else if (Constants.DIGEST.equals(scheme)) { + break; + case Constants.DIGEST: authScheme = new DigestScheme(); - } else if (Constants.NTLM.equals(scheme)) { + break; + case Constants.NTLM: { final Properties props = new Properties(); paramMap.entrySet().stream().filter(e -> e.getKey().startsWith("jcifs.")).forEach(e -> { props.setProperty(e.getKey(), e.getValue()); }); authScheme = new NTLMScheme(new JcifsEngine(props)); - } else if (Constants.FORM.equals(scheme)) { + break; + } + case Constants.FORM: { final String prefix = CRAWLER_WEB_AUTH + "." + webAuthName + "."; final Map 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); + break; + } + default: + break; } return authScheme; } 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 2422291154..cd60ad4252 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 @@ -59,13 +59,12 @@ public Authentication getAuthentication() { private AuthScheme getAuthScheme() { final String scheme = getProtocolScheme(); - if (Constants.BASIC.equals(scheme)) { + switch (scheme) { + case Constants.BASIC: return new BasicScheme(); - } - if (Constants.DIGEST.equals(scheme)) { + case Constants.DIGEST: return new DigestScheme(); - } - if (Constants.NTLM.equals(scheme)) { + case Constants.NTLM: { final Properties props = new Properties(); getWebConfig().getConfigParameterMap(ConfigName.CONFIG).entrySet().stream() .filter(e -> e.getKey().startsWith(Config.JCIFS_PREFIX)).forEach(e -> { @@ -73,10 +72,13 @@ private AuthScheme getAuthScheme() { }); return new NTLMScheme(new JcifsEngine(props)); } - if (Constants.FORM.equals(scheme)) { + case Constants.FORM: { final Map parameterMap = ParameterUtil.parse(getParameters()); return new FormScheme(parameterMap); } + default: + break; + } return null; } 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 b6f8220b4e..39486ee3e4 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 @@ -172,14 +172,11 @@ public CrawlerClientFactory initializeClientFactory(final Supplier webAuthList = webAuthenticationService.getWebAuthenticationList(getId()); diff --git a/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java b/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java index cd7f99dc60..3507bceb81 100644 --- a/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java +++ b/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java @@ -87,8 +87,8 @@ protected void doXContent(final XContentBuilder builder, final Params params) th if (this.params != null && !this.params.isEmpty()) { builder.field(PARAMS.getPreferredName(), this.params); } - if (this.activeFeatures != null && !this.activeFeatures.isEmpty()) { - builder.field(ACTIVE_FEATURES.getPreferredName(), this.activeFeatures); + if (activeFeatures != null && !activeFeatures.isEmpty()) { + builder.field(ACTIVE_FEATURES.getPreferredName(), activeFeatures); } printBoostAndQueryName(builder); builder.endObject(); diff --git a/src/main/java/org/codelibs/fess/exception/ContainerNotAvailableException.java b/src/main/java/org/codelibs/fess/exception/ContainerNotAvailableException.java index b425cbb6f4..f575b6d87c 100644 --- a/src/main/java/org/codelibs/fess/exception/ContainerNotAvailableException.java +++ b/src/main/java/org/codelibs/fess/exception/ContainerNotAvailableException.java @@ -32,7 +32,7 @@ public ContainerNotAvailableException(final String componentName, final Throwabl public ContainerNotAvailableException(final Throwable cause) { super("Container is not avaiable."); - this.componentName = "container"; + componentName = "container"; } public String getComponentName() { diff --git a/src/main/java/org/codelibs/fess/exec/Crawler.java b/src/main/java/org/codelibs/fess/exec/Crawler.java index f0624fa86a..a51c58fd80 100644 --- a/src/main/java/org/codelibs/fess/exec/Crawler.java +++ b/src/main/java/org/codelibs/fess/exec/Crawler.java @@ -495,8 +495,7 @@ public int doCrawl(final Options options) { } // delete expired sessions - SystemHelper systemHelper2 = ComponentUtil.getSystemHelper(); - crawlingInfoService.deleteSessionIdsBefore(options.sessionId, options.name, systemHelper2.getCurrentTimeAsLong()); + crawlingInfoService.deleteSessionIdsBefore(options.sessionId, options.name, systemHelper.getCurrentTimeAsLong()); final List webConfigIdList = options.getWebConfigIdList(); final List fileConfigIdList = options.getFileConfigIdList(); diff --git a/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java index d0ef0a190c..d0644086de 100644 --- a/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java +++ b/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java @@ -92,7 +92,7 @@ protected void processCrawlingAccessException(final Object... objs) { final CrawlingAccessException cae = (CrawlingAccessException) objs[2]; try { Throwable t = cae; - if (t instanceof MultipleCrawlingAccessException mcae) { + if (t instanceof final MultipleCrawlingAccessException mcae) { final Throwable[] causes = mcae.getCauses(); if (causes.length > 0) { t = causes[causes.length - 1]; @@ -106,7 +106,7 @@ protected void processCrawlingAccessException(final Object... objs) { } else { errorName = t.getClass().getCanonicalName(); } - FailureUrl failureUrl = storeFailureUrl(crawlerContext, urlQueue, errorName, t); + final FailureUrl failureUrl = storeFailureUrl(crawlerContext, urlQueue, errorName, t); if (failureUrl != null) { failureUrlId = failureUrl.getId(); } diff --git a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java index 368abe5201..756dba06bd 100644 --- a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java +++ b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java @@ -101,10 +101,10 @@ public void sendDocuments(final SearchEngineClient searchEngineClient, final Doc if (logger.isInfoEnabled()) { if (docList.getContentSize() > 0) { logger.info("Sent {} docs (Doc:{process {}ms, send {}ms, size {}}, {})", docList.size(), docList.getProcessingTime(), - (systemHelper.getCurrentTimeAsLong() - execTime), MemoryUtil.byteCountToDisplaySize(docList.getContentSize()), + systemHelper.getCurrentTimeAsLong() - execTime, MemoryUtil.byteCountToDisplaySize(docList.getContentSize()), MemoryUtil.getMemoryUsageLog()); } else { - logger.info("Sent {} docs (Doc:{send {}ms}, {})", docList.size(), (systemHelper.getCurrentTimeAsLong() - execTime), + logger.info("Sent {} docs (Doc:{send {}ms}, {})", docList.size(), systemHelper.getCurrentTimeAsLong() - execTime, MemoryUtil.getMemoryUsageLog()); } } diff --git a/src/main/java/org/codelibs/fess/helper/IntervalControlHelper.java b/src/main/java/org/codelibs/fess/helper/IntervalControlHelper.java index 85a90d4721..40e7630635 100644 --- a/src/main/java/org/codelibs/fess/helper/IntervalControlHelper.java +++ b/src/main/java/org/codelibs/fess/helper/IntervalControlHelper.java @@ -124,8 +124,8 @@ public boolean isTarget(final int hours, final int minutes, final int day) { return compareTime(fromHours, fromMinutes, hours, minutes) >= 0 && compareTime(hours, minutes, toHours, toMinutes) >= 0 && isInDays(day); } - if ((compareTime(hours, minutes, toHours, toMinutes) >= 0 && isInDays(day + 1)) - || (compareTime(fromHours, fromMinutes, hours, minutes) >= 0 && isInDays(day))) { + if (compareTime(hours, minutes, toHours, toMinutes) >= 0 && isInDays(day + 1) + || compareTime(fromHours, fromMinutes, hours, minutes) >= 0 && isInDays(day)) { return true; } return false; diff --git a/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java b/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java index e0cb857e89..962e137955 100644 --- a/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java +++ b/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java @@ -134,8 +134,8 @@ protected boolean matchLocale(final Locale requestLocale, final Locale targetLoc if (targetLocale.equals(requestLocale) || targetLocale.equals(Locale.ROOT)) { return true; } - if ((requestLocale == null) || !requestLocale.getLanguage().equals(targetLocale.getLanguage()) - || (targetLocale.getCountry().length() > 0 && !requestLocale.getCountry().equals(targetLocale.getCountry()))) { + if (requestLocale == null || !requestLocale.getLanguage().equals(targetLocale.getLanguage()) + || targetLocale.getCountry().length() > 0 && !requestLocale.getCountry().equals(targetLocale.getCountry())) { return false; } return true; diff --git a/src/main/java/org/codelibs/fess/helper/ProcessHelper.java b/src/main/java/org/codelibs/fess/helper/ProcessHelper.java index 714b3742d8..6eb3cc6773 100644 --- a/src/main/java/org/codelibs/fess/helper/ProcessHelper.java +++ b/src/main/java/org/codelibs/fess/helper/ProcessHelper.java @@ -49,7 +49,7 @@ public void destroy() { if (logger.isInfoEnabled()) { logger.info("Stopping process {}", sessionId); } - if ((destroyProcess(sessionId) == 0) && logger.isInfoEnabled()) { + if (destroyProcess(sessionId) == 0 && logger.isInfoEnabled()) { logger.info("Stopped process {}", sessionId); } } diff --git a/src/main/java/org/codelibs/fess/helper/SearchHelper.java b/src/main/java/org/codelibs/fess/helper/SearchHelper.java index b46437129a..1a394dc49b 100644 --- a/src/main/java/org/codelibs/fess/helper/SearchHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SearchHelper.java @@ -77,7 +77,7 @@ public class SearchHelper { // Variable // - protected SearchRequestParamsRewriter[] searchRequestParamsRewriters = new SearchRequestParamsRewriter[0]; + protected SearchRequestParamsRewriter[] searchRequestParamsRewriters = {}; // =================================================================================== // Method @@ -173,7 +173,7 @@ protected List> searchInternal(final String query, final Sea final OptionalThing userBean) { final RankFusionProcessor rankFusionProcessor = ComponentUtil.getRankFusionProcessor(); final List> documentItems = rankFusionProcessor.search(query, params, userBean); - if (documentItems instanceof QueryResponseList queryResponseList) { + if (documentItems instanceof final QueryResponseList queryResponseList) { final FessConfig fessConfig = ComponentUtil.getFessConfig(); if (queryResponseList.getAllRecordCount() <= fessConfig.getQueryOrsearchMinHitCountAsInteger()) { return LaRequestUtil.getOptionalRequest().map(request -> { diff --git a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java index 96bf3ff421..d8f3fd9ed4 100644 --- a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java @@ -171,8 +171,8 @@ public void indexFromSearchLog(final List searchLogList) { } final LocalDateTime requestedAt = searchLog.getRequestedAt(); - if ((sessionId == null) || (duplicateSessionMap.containsKey(sessionId) - && duplicateSessionMap.get(sessionId).plusMinutes(searchStoreInterval).isAfter(requestedAt))) { + if (sessionId == null || duplicateSessionMap.containsKey(sessionId) + && duplicateSessionMap.get(sessionId).plusMinutes(searchStoreInterval).isAfter(requestedAt)) { return; } diff --git a/src/main/java/org/codelibs/fess/helper/ViewHelper.java b/src/main/java/org/codelibs/fess/helper/ViewHelper.java index 9e0d4d22b1..de808d36a9 100644 --- a/src/main/java/org/codelibs/fess/helper/ViewHelper.java +++ b/src/main/java/org/codelibs/fess/helper/ViewHelper.java @@ -313,7 +313,7 @@ public HighlightInfo createHighlightInfo() { protected void updateHighlightInfo(final HighlightInfo highlightInfo, final int width) { if (width < TABLET_WIDTH) { - float ratio = ((float) width) / ((float) TABLET_WIDTH); + float ratio = (float) width / (float) TABLET_WIDTH; if (ratio < 0.5) { ratio = 0.5f; } @@ -638,7 +638,8 @@ public Object getSitePath(final Map docMap) { final int size = fessConfig.getResponseMaxSitePathLengthAsInteger(); if (size > 3) { return StringUtils.abbreviate(site, size); - } else if (size >= 0) { + } + if (size >= 0) { return site; } } diff --git a/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java b/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java index e9849e57ca..c7be673f6a 100644 --- a/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java +++ b/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java @@ -43,7 +43,6 @@ import org.codelibs.fess.es.config.exentity.FileConfig; import org.codelibs.fess.es.config.exentity.WebConfig; import org.codelibs.fess.indexer.IndexUpdater; -import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.util.ComponentUtil; public class WebFsIndexHelper { @@ -92,7 +91,7 @@ protected void doCrawl(final String sessionId, final List webConfigLi final int multiprocessCrawlingCount = ComponentUtil.getFessConfig().getCrawlingThreadCount(); final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); - final FessConfig fessConfig = ComponentUtil.getFessConfig(); + ComponentUtil.getFessConfig(); final ProtocolHelper protocolHelper = ComponentUtil.getProtocolHelper(); final long startTime = systemHelper.getCurrentTimeAsLong(); diff --git a/src/main/java/org/codelibs/fess/indexer/DocBoostMatcher.java b/src/main/java/org/codelibs/fess/indexer/DocBoostMatcher.java index cc9878d131..cc6831ad3d 100644 --- a/src/main/java/org/codelibs/fess/indexer/DocBoostMatcher.java +++ b/src/main/java/org/codelibs/fess/indexer/DocBoostMatcher.java @@ -47,7 +47,7 @@ public boolean match(final Map map) { final Object value = ComponentUtil.getScriptEngineFactory().getScriptEngine(scriptType).evaluate(matchExpression, map); if (value instanceof Boolean) { - return ((Boolean) value); + return (Boolean) value; } return false; @@ -66,7 +66,7 @@ public float getValue(final Map map) { return ((Long) value).floatValue(); } if (value instanceof Float) { - return ((Float) value); + return (Float) value; } if (value instanceof Double) { return ((Double) value).floatValue(); diff --git a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java index cb6910eb51..6d16d01699 100644 --- a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java +++ b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java @@ -553,13 +553,13 @@ private void cleanupFinishedSessionData() { deleteBySessionId(sessionId); if (logger.isDebugEnabled()) { logger.debug("Deleted {} documents. The execution time is {}ms.", sessionId, - (systemHelper.getCurrentTimeAsLong() - execTime2)); + systemHelper.getCurrentTimeAsLong() - execTime2); } } finishedSessionIdList.clear(); if (logger.isInfoEnabled()) { - logger.info("Deleted completed document data. The execution time is {}ms.", (systemHelper.getCurrentTimeAsLong() - execTime)); + logger.info("Deleted completed document data. The execution time is {}ms.", systemHelper.getCurrentTimeAsLong() - execTime); } } diff --git a/src/main/java/org/codelibs/fess/job/ExecJob.java b/src/main/java/org/codelibs/fess/job/ExecJob.java index 1730334803..695f20ce17 100644 --- a/src/main/java/org/codelibs/fess/job/ExecJob.java +++ b/src/main/java/org/codelibs/fess/job/ExecJob.java @@ -124,12 +124,12 @@ public ExecJob gcLogging() { } public ExecJob jvmOptions(final String... options) { - Collections.addAll(this.jvmOptions, options); + Collections.addAll(jvmOptions, options); return this; } public ExecJob lastaEnv(final String env) { - this.lastaEnv = env; + lastaEnv = env; return this; } diff --git a/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java b/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java index 71eb791517..437f970bfa 100644 --- a/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java +++ b/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java @@ -53,7 +53,7 @@ public GenerateThumbnailJob numOfThreads(final int numOfThreads) { } public GenerateThumbnailJob cleanup() { - this.cleanup = true; + cleanup = true; return this; } 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 737862b42d..3db7e1d811 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java @@ -862,7 +862,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** The key of the configuration. e.g. true */ String QUERY_REPLACE_TERM_WITH_PREFIX_QUERY = "query.replace.term.with.prefix.query"; - /** The key of the configuration. e.g. 0 */ + /** The key of the configuration. e.g. -1 */ String QUERY_ORSEARCH_MIN_HIT_COUNT = "query.orsearch.min.hit.count"; /** The key of the configuration. e.g. u0021u002Cu002Eu003Fu0589u061Fu06D4u0700u0701u0702u0964u104Au104Bu1362u1367u1368u166Eu1803u1809u203Cu203Du2047u2048u2049u3002uFE52uFE57uFF01uFF0EuFF1FuFF61 */ @@ -4441,14 +4441,14 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** * Get the value for the key 'query.orsearch.min.hit.count'.
- * The value is, e.g. 0
+ * The value is, e.g. -1
* @return The value of found property. (NotNull: if not found, exception but basically no way) */ String getQueryOrsearchMinHitCount(); /** * Get the value for the key 'query.orsearch.min.hit.count' as {@link Integer}.
- * The value is, e.g. 0
+ * The value is, e.g. -1
* @return The value of found property. (NotNull: if not found, exception but basically no way) * @throws NumberFormatException When the property is not integer. */ @@ -11263,7 +11263,7 @@ protected java.util.Map prepareGeneratedDefaultMap() { 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_ORSEARCH_MIN_HIT_COUNT, "0"); + defaultMap.put(FessConfig.QUERY_ORSEARCH_MIN_HIT_COUNT, "-1"); defaultMap.put(FessConfig.QUERY_HIGHLIGHT_TERMINAL_CHARS, "u0021u002Cu002Eu003Fu0589u061Fu06D4u0700u0701u0702u0964u104Au104Bu1362u1367u1368u166Eu1803u1809u203Cu203Du2047u2048u2049u3002uFE52uFE57uFF01uFF0EuFF1FuFF61"); defaultMap.put(FessConfig.QUERY_HIGHLIGHT_FRAGMENT_SIZE, "60"); 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 1a741a69fe..baa4f75143 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java @@ -909,14 +909,15 @@ default String[] getSupportedUploadedMediaExtentionsAsArray() { String getJobTemplateTitleData(); default String getJobTemplateTitle(final String type) { - if (Constants.WEB_CRAWLER_TYPE.equals(type)) { + switch (type) { + case Constants.WEB_CRAWLER_TYPE: return getJobTemplateTitleWeb(); - } - if (Constants.FILE_CRAWLER_TYPE.equals(type)) { + case Constants.FILE_CRAWLER_TYPE: return getJobTemplateTitleFile(); - } - if (Constants.DATA_CRAWLER_TYPE.equals(type)) { + case Constants.DATA_CRAWLER_TYPE: return getJobTemplateTitleData(); + default: + break; } return "None"; } @@ -1527,25 +1528,25 @@ default Map convertToStorableDoc(final Map sourc value = FessFunctions.parseDate(value.toString()); } } else if (integerFieldSet.contains(key)) { - if (value instanceof Number num) { + if (value instanceof final Number num) { value = num.intValue(); } else { value = DfTypeUtil.toInteger(value.toString()); } } else if (longFieldSet.contains(key)) { - if (value instanceof Number num) { + if (value instanceof final Number num) { value = num.longValue(); } else { value = DfTypeUtil.toLong(value.toString()); } } else if (floatFieldSet.contains(key)) { - if (value instanceof Number num) { + if (value instanceof final Number num) { value = num.floatValue(); } else { value = DfTypeUtil.toFloat(value.toString()); } } else if (doubleFieldSet.contains(key)) { - if (value instanceof Number num) { + if (value instanceof final Number num) { value = num.doubleValue(); } else { value = DfTypeUtil.toDouble(value.toString()); @@ -1855,7 +1856,7 @@ default boolean validateThumbnailSize(final int width, final int height) { } final float ratio = getThumbnailHtmlImageMaxAspectRatioAsDecimal().floatValue(); - if (((float) width) / ((float) height) > ratio || ((float) height) / ((float) width) > ratio) { + if ((float) width / (float) height > ratio || (float) height / (float) width > ratio) { return false; } diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java index 7d83a4a123..88c36d60c5 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/sponsor/FessMultipartRequestHandler.java @@ -122,7 +122,7 @@ protected DiskFileItemFactory createDiskFileItemFactory() { } protected int getSizeThreshold() { - return ComponentUtil.getFessConfig().getHttpFileuploadThresholdSizeAsInteger().intValue(); + return ComponentUtil.getFessConfig().getHttpFileuploadThresholdSizeAsInteger(); } protected File createRepositoryFile() { @@ -307,9 +307,7 @@ protected void handleSizeLimitExceededException(final HttpServletRequest request final InputStream is = request.getInputStream(); try { final byte[] buf = new byte[1024]; - @SuppressWarnings("unused") - int len = 0; - while ((len = is.read(buf)) != -1) {} + while ((is.read(buf)) != -1) {} } catch (final Exception ignored) {} finally { try { is.close(); diff --git a/src/main/java/org/codelibs/fess/query/DefaultQueryBuilder.java b/src/main/java/org/codelibs/fess/query/DefaultQueryBuilder.java index b0682e2efc..a93710b5e8 100644 --- a/src/main/java/org/codelibs/fess/query/DefaultQueryBuilder.java +++ b/src/main/java/org/codelibs/fess/query/DefaultQueryBuilder.java @@ -133,7 +133,7 @@ public boolean equals(final Object obj) { if (this == obj) { return true; } - if ((obj == null) || (getClass() != obj.getClass())) { + if (obj == null || getClass() != obj.getClass()) { return false; } final DefaultQueryBuilder other = (DefaultQueryBuilder) obj; diff --git a/src/main/java/org/codelibs/fess/query/QueryCommand.java b/src/main/java/org/codelibs/fess/query/QueryCommand.java index 6b70450c8e..2aabf8d4c7 100644 --- a/src/main/java/org/codelibs/fess/query/QueryCommand.java +++ b/src/main/java/org/codelibs/fess/query/QueryCommand.java @@ -120,7 +120,7 @@ protected DefaultQueryBuilder createDefaultQueryBuilder() { protected QueryBuilder buildMatchPhraseQuery(final String f, final String text) { final FessConfig fessConfig = ComponentUtil.getFessConfig(); if (text == null || text.length() != 1 - || (!fessConfig.getIndexFieldTitle().equals(f) && !fessConfig.getIndexFieldContent().equals(f))) { + || !fessConfig.getIndexFieldTitle().equals(f) && !fessConfig.getIndexFieldContent().equals(f)) { return QueryBuilders.matchPhraseQuery(f, text); } diff --git a/src/main/java/org/codelibs/fess/query/TermQueryCommand.java b/src/main/java/org/codelibs/fess/query/TermQueryCommand.java index 6eb86f157c..1b8b5d9599 100644 --- a/src/main/java/org/codelibs/fess/query/TermQueryCommand.java +++ b/src/main/java/org/codelibs/fess/query/TermQueryCommand.java @@ -72,17 +72,18 @@ protected QueryBuilder convertTermQuery(final FessConfig fessConfig, final Query if (fessConfig.getQueryReplaceTermWithPrefixQueryAsBoolean() && text.length() > 1 && text.endsWith("*")) { return convertPrefixQuery(fessConfig, context, termQuery, boost, field, text); } - if (DEFAULT_FIELD.equals(field)) { + switch (field) { + case DEFAULT_FIELD: return convertDefaultTermQuery(fessConfig, context, termQuery, boost, field, text); - } - if (SORT_FIELD.equals(field)) { + case SORT_FIELD: return convertSortQuery(fessConfig, context, termQuery, boost, field, text); - } - if (SITE_FIELD.equals(field)) { + case SITE_FIELD: return convertSiteQuery(fessConfig, context, termQuery, boost, field, text); + default: + break; } - if (INURL_FIELD.equals(field) || (StringUtil.equals(field, context.getDefaultField()) - && fessConfig.getIndexFieldUrl().equals(context.getDefaultField()))) { + if (INURL_FIELD.equals(field) + || StringUtil.equals(field, context.getDefaultField()) && fessConfig.getIndexFieldUrl().equals(context.getDefaultField())) { return convertWildcardQuery(fessConfig, context, termQuery, boost, field, text); } if (!isSearchField(field)) { diff --git a/src/main/java/org/codelibs/fess/query/TermRangeQueryCommand.java b/src/main/java/org/codelibs/fess/query/TermRangeQueryCommand.java index 5a547dcc62..48af83fe22 100644 --- a/src/main/java/org/codelibs/fess/query/TermRangeQueryCommand.java +++ b/src/main/java/org/codelibs/fess/query/TermRangeQueryCommand.java @@ -59,10 +59,10 @@ protected QueryBuilder convertTermRangeQuery(final QueryContext context, final T final StringBuilder queryBuf = new StringBuilder(); queryBuf.append(termRangeQuery.includesLower() ? '[' : '{'); final BytesRef lowerTerm = termRangeQuery.getLowerTerm(); - queryBuf.append(lowerTerm != null ? ("*".equals(Term.toString(lowerTerm)) ? "\\*" : Term.toString(lowerTerm)) : "*"); + queryBuf.append(lowerTerm != null ? "*".equals(Term.toString(lowerTerm)) ? "\\*" : Term.toString(lowerTerm) : "*"); queryBuf.append(" TO "); final BytesRef upperTerm = termRangeQuery.getUpperTerm(); - queryBuf.append(upperTerm != null ? ("*".equals(Term.toString(upperTerm)) ? "\\*" : Term.toString(upperTerm)) : "*"); + queryBuf.append(upperTerm != null ? "*".equals(Term.toString(upperTerm)) ? "\\*" : Term.toString(upperTerm) : "*"); queryBuf.append(termRangeQuery.includesUpper() ? ']' : '}'); final String origQuery = queryBuf.toString(); context.addFieldLog(Constants.DEFAULT_FIELD, origQuery); diff --git a/src/main/java/org/codelibs/fess/query/parser/QueryParser.java b/src/main/java/org/codelibs/fess/query/parser/QueryParser.java index a8a274260b..42a62dc8e7 100644 --- a/src/main/java/org/codelibs/fess/query/parser/QueryParser.java +++ b/src/main/java/org/codelibs/fess/query/parser/QueryParser.java @@ -60,7 +60,7 @@ protected org.apache.lucene.queryparser.classic.QueryParser createQueryParser() final LuceneQueryParser parser = new LuceneQueryParser(defaultField, analyzer); parser.setAllowLeadingWildcard(allowLeadingWildcard); LaRequestUtil.getOptionalRequest().ifPresent(req -> { - if (req.getAttribute(Constants.DEFAULT_QUERY_OPERATOR) instanceof String op) { + if (req.getAttribute(Constants.DEFAULT_QUERY_OPERATOR) instanceof final String op) { parser.setDefaultOperator(Operator.valueOf(op)); } else { parser.setDefaultOperator(defaultOperator); @@ -134,13 +134,13 @@ protected static class LuceneQueryParser extends org.apache.lucene.queryparser.c */ public LuceneQueryParser(final String f, final Analyzer a) { super(f, a); - this.defaultField = f; + defaultField = f; } @Override - protected Query getFieldQuery(final String field, final String queryText, boolean quoted) throws ParseException { + protected Query getFieldQuery(final String field, final String queryText, final boolean quoted) throws ParseException { final org.apache.lucene.search.Query query = super.getFieldQuery(field, queryText, quoted); - if (quoted && query instanceof TermQuery termQuery) { + if (quoted && query instanceof final TermQuery termQuery) { final Pair splitField = splitField(defaultField, field); if (defaultField.equals(splitField.cur)) { final PhraseQuery.Builder builder = new PhraseQuery.Builder(); @@ -151,10 +151,11 @@ protected Query getFieldQuery(final String field, final String queryText, boolea return query; } - protected Pair splitField(String defaultField, String field) { - int indexOf = field.indexOf(':'); - if (indexOf < 0) + protected Pair splitField(final String defaultField, final String field) { + final int indexOf = field.indexOf(':'); + if (indexOf < 0) { return new Pair<>(field, null); + } final String indexField = indexOf == 0 ? defaultField : field.substring(0, indexOf); final String extensionKey = field.substring(indexOf + 1); return new Pair<>(indexField, extensionKey); diff --git a/src/main/java/org/codelibs/fess/rank/fusion/RankFusionProcessor.java b/src/main/java/org/codelibs/fess/rank/fusion/RankFusionProcessor.java index 32be2e30f0..aec9c5866e 100644 --- a/src/main/java/org/codelibs/fess/rank/fusion/RankFusionProcessor.java +++ b/src/main/java/org/codelibs/fess/rank/fusion/RankFusionProcessor.java @@ -450,7 +450,7 @@ public String toString() { } public void setSeacher(final RankFusionSearcher searcher) { - this.searchers[0] = searcher; + searchers[0] = searcher; } public void register(final RankFusionSearcher searcher) { @@ -464,7 +464,7 @@ public void register(final RankFusionSearcher searcher) { if (executorService == null) { int numThreads = ComponentUtil.getFessConfig().getRankFusionThreadsAsInteger(); if (numThreads <= 0) { - numThreads = (Runtime.getRuntime().availableProcessors() * 3) / 2 + 1; + numThreads = Runtime.getRuntime().availableProcessors() * 3 / 2 + 1; } executorService = Executors.newFixedThreadPool(numThreads); } diff --git a/src/main/java/org/codelibs/fess/score/ScoreBooster.java b/src/main/java/org/codelibs/fess/score/ScoreBooster.java index 93626a4a10..ab5903e117 100644 --- a/src/main/java/org/codelibs/fess/score/ScoreBooster.java +++ b/src/main/java/org/codelibs/fess/score/ScoreBooster.java @@ -110,7 +110,7 @@ protected void flush() { } public int getPriority() { - return this.priority; + return priority; } public void setPriority(final int priority) { @@ -118,7 +118,7 @@ public void setPriority(final int priority) { } public void setRequestTimeout(final String bulkRequestTimeout) { - this.requestTimeout = bulkRequestTimeout; + requestTimeout = bulkRequestTimeout; } public void setRequestCacheSize(final int requestCacheSize) { diff --git a/src/main/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java b/src/main/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java index d54b9a97b7..93b3b84615 100644 --- a/src/main/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java +++ b/src/main/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticator.java @@ -49,8 +49,9 @@ import com.google.api.client.json.JsonFactory; import com.google.api.client.json.JsonParser; import com.google.api.client.json.JsonToken; -import com.google.api.client.json.jackson2.JacksonFactory; -import com.google.api.client.util.Base64; +import com.google.api.client.json.gson.GsonFactory; +import com.google.common.io.BaseEncoding; +import com.google.common.io.BaseEncoding.DecodingException; import jakarta.annotation.PostConstruct; import jakarta.servlet.http.HttpServletRequest; @@ -60,6 +61,10 @@ public class OpenIdConnectAuthenticator implements SsoAuthenticator { private static final Logger logger = LogManager.getLogger(OpenIdConnectAuthenticator.class); + private static final BaseEncoding BASE64_DECODER = BaseEncoding.base64().withSeparator("\n", 64); + + private static final BaseEncoding BASE64URL_DECODER = BaseEncoding.base64Url().withSeparator("\n", 64); + protected static final String OIC_AUTH_SERVER_URL = "oic.auth.server.url"; protected static final String OIC_CLIENT_ID = "oic.client.id"; @@ -76,7 +81,7 @@ public class OpenIdConnectAuthenticator implements SsoAuthenticator { protected final HttpTransport httpTransport = new NetHttpTransport(); - protected final JsonFactory jsonFactory = JacksonFactory.getDefaultInstance(); + protected final JsonFactory jsonFactory = GsonFactory.getDefaultInstance(); @PostConstruct public void init() { @@ -123,14 +128,28 @@ protected String getAuthUrl(final HttpServletRequest request) { .build(); } + protected byte[] decodeBase64(String base64String) { + if (base64String == null) { + return null; + } + try { + return BASE64_DECODER.decode(base64String); + } catch (IllegalArgumentException e) { + if (e.getCause() instanceof DecodingException) { + return BASE64URL_DECODER.decode(base64String.trim()); + } + throw e; + } + } + protected LoginCredential processCallback(final HttpServletRequest request, final String code) { try { final TokenResponse tr = getTokenUrl(code); final String[] jwt = ((String) tr.get("id_token")).split("\\."); - final String jwtHeader = new String(Base64.decodeBase64(jwt[0]), Constants.UTF_8_CHARSET); - final String jwtClaim = new String(Base64.decodeBase64(jwt[1]), Constants.UTF_8_CHARSET); - final String jwtSigniture = new String(Base64.decodeBase64(jwt[2]), Constants.UTF_8_CHARSET); + final String jwtHeader = new String(decodeBase64(jwt[0]), Constants.UTF_8_CHARSET); + final String jwtClaim = new String(decodeBase64(jwt[1]), Constants.UTF_8_CHARSET); + final String jwtSigniture = new String(decodeBase64(jwt[2]), Constants.UTF_8_CHARSET); if (logger.isDebugEnabled()) { logger.debug("jwtHeader: {}", jwtHeader); @@ -185,28 +204,21 @@ protected void parseJwtClaim(final String jwtClaim, final Map at } } - private Object parsePrimitive(JsonParser jsonParser) throws IOException { - JsonToken token = jsonParser.getCurrentToken(); - switch (token) { - case VALUE_STRING: - return jsonParser.getText(); - case VALUE_NUMBER_INT: - return jsonParser.getLongValue(); - case VALUE_NUMBER_FLOAT: - return jsonParser.getDoubleValue(); - case VALUE_TRUE: - return true; - case VALUE_FALSE: - return false; - case VALUE_NULL: - return null; - default: - return null; // Or throw an exception if unexpected token - } + protected Object parsePrimitive(final JsonParser jsonParser) throws IOException { + final JsonToken token = jsonParser.getCurrentToken(); + return switch (token) { + case VALUE_STRING -> jsonParser.getText(); + case VALUE_NUMBER_INT -> jsonParser.getLongValue(); + case VALUE_NUMBER_FLOAT -> jsonParser.getDoubleValue(); + case VALUE_TRUE -> true; + case VALUE_FALSE -> false; + case VALUE_NULL -> null; + default -> null; // Or throw an exception if unexpected token + }; } - private Object parseArray(JsonParser jsonParser) throws IOException { - List list = new ArrayList<>(); + protected Object parseArray(final JsonParser jsonParser) throws IOException { + final List list = new ArrayList<>(); while (jsonParser.nextToken() != JsonToken.END_ARRAY) { if (jsonParser.getCurrentToken() == JsonToken.START_OBJECT) { list.add(parseObject(jsonParser)); @@ -217,17 +229,13 @@ private Object parseArray(JsonParser jsonParser) throws IOException { } } - if (list.stream().allMatch(String.class::isInstance)) { - return list.toArray(new String[list.size()]); - } - return list; } - private Map parseObject(JsonParser jsonParser) throws IOException { - Map nestedMap = new HashMap<>(); + protected Map parseObject(final JsonParser jsonParser) throws IOException { + final Map nestedMap = new HashMap<>(); while (jsonParser.nextToken() != JsonToken.END_OBJECT) { - String fieldName = jsonParser.getCurrentName(); + final String fieldName = jsonParser.getCurrentName(); if (fieldName != null) { jsonParser.nextToken(); // Move to the value of the current field 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 fbcd8582d6..97601462b1 100644 --- a/src/main/java/org/codelibs/fess/sso/spnego/SpnegoAuthenticator.java +++ b/src/main/java/org/codelibs/fess/sso/spnego/SpnegoAuthenticator.java @@ -173,7 +173,8 @@ public ServletContext getServletContext() { @Override public String getInitParameter(final String name) { - if (SpnegoHttpFilter.Constants.LOGGER_LEVEL.equals(name)) { + switch (name) { + case SpnegoHttpFilter.Constants.LOGGER_LEVEL: { final String logLevel = getProperty(SPNEGO_LOGGER_LEVEL, StringUtil.EMPTY); if (StringUtil.isNotBlank(logLevel)) { return logLevel; @@ -192,41 +193,32 @@ public String getInitParameter(final String name) { } return "0"; } - if (SpnegoHttpFilter.Constants.LOGIN_CONF.equals(name)) { + case SpnegoHttpFilter.Constants.LOGIN_CONF: return getResourcePath(getProperty(SPNEGO_LOGIN_CONF, "auth_login.conf")); - } - if (SpnegoHttpFilter.Constants.KRB5_CONF.equals(name)) { + case SpnegoHttpFilter.Constants.KRB5_CONF: return getResourcePath(getProperty(SPNEGO_KRB5_CONF, "krb5.conf")); - } - if (SpnegoHttpFilter.Constants.CLIENT_MODULE.equals(name)) { + case SpnegoHttpFilter.Constants.CLIENT_MODULE: return getProperty(SPNEGO_LOGIN_CLIENT_MODULE, "spnego-client"); - } - if (SpnegoHttpFilter.Constants.SERVER_MODULE.equals(name)) { + case SpnegoHttpFilter.Constants.SERVER_MODULE: return getProperty(SPNEGO_LOGIN_SERVER_MODULE, "spnego-server"); - } - if (SpnegoHttpFilter.Constants.PREAUTH_USERNAME.equals(name)) { + case SpnegoHttpFilter.Constants.PREAUTH_USERNAME: return getProperty(SPNEGO_PREAUTH_USERNAME, "username"); - } - if (SpnegoHttpFilter.Constants.PREAUTH_PASSWORD.equals(name)) { + case SpnegoHttpFilter.Constants.PREAUTH_PASSWORD: return getProperty(SPNEGO_PREAUTH_PASSWORD, "password"); - } - if (SpnegoHttpFilter.Constants.ALLOW_BASIC.equals(name)) { + case SpnegoHttpFilter.Constants.ALLOW_BASIC: return getProperty(SPNEGO_ALLOW_BASIC, "true"); - } - if (SpnegoHttpFilter.Constants.ALLOW_UNSEC_BASIC.equals(name)) { + case SpnegoHttpFilter.Constants.ALLOW_UNSEC_BASIC: return getProperty(SPNEGO_ALLOW_UNSECURE_BASIC, "true"); - } - if (SpnegoHttpFilter.Constants.PROMPT_NTLM.equals(name)) { + case SpnegoHttpFilter.Constants.PROMPT_NTLM: return getProperty(SPNEGO_PROMPT_NTLM, "true"); - } - if (SpnegoHttpFilter.Constants.ALLOW_LOCALHOST.equals(name)) { + case SpnegoHttpFilter.Constants.ALLOW_LOCALHOST: return getProperty(SPNEGO_ALLOW_LOCALHOST, "true"); - } - if (SpnegoHttpFilter.Constants.ALLOW_DELEGATION.equals(name)) { + case SpnegoHttpFilter.Constants.ALLOW_DELEGATION: return getProperty(SPNEGO_ALLOW_DELEGATION, "false"); - } - if (SpnegoHttpFilter.Constants.EXCLUDE_DIRS.equals(name)) { + case SpnegoHttpFilter.Constants.EXCLUDE_DIRS: return getProperty(SPNEGO_EXCLUDE_DIRS, StringUtil.EMPTY); + default: + break; } return null; } diff --git a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java index 0bfd711ebe..7f0af543ac 100644 --- a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java +++ b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java @@ -289,7 +289,7 @@ public boolean offer(final Map docMap) { } } if (logger.isDebugEnabled()) { - logger.debug("Thumbnail generator is not found: {}", (docMap != null ? docMap.get("url") : docMap)); + logger.debug("Thumbnail generator is not found: {}", docMap != null ? docMap.get("url") : docMap); } return false; } @@ -370,9 +370,9 @@ protected static class FilePurgeVisitor implements FileVisitor { this.basePath = basePath; this.imageExtention = imageExtention; this.expiry = expiry; - this.fessConfig = ComponentUtil.getFessConfig(); - this.maxPurgeSize = fessConfig.getPageThumbnailPurgeMaxFetchSizeAsInteger(); - this.searchEngineClient = ComponentUtil.getSearchEngineClient(); + fessConfig = ComponentUtil.getFessConfig(); + maxPurgeSize = fessConfig.getPageThumbnailPurgeMaxFetchSizeAsInteger(); + searchEngineClient = ComponentUtil.getSearchEngineClient(); } protected void deleteFiles() { diff --git a/src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java b/src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java index 90a86378af..cb8250bc50 100644 --- a/src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java +++ b/src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java @@ -65,11 +65,11 @@ protected void updateProperties() { final FessConfig fessConfig = ComponentUtil.getFessConfig(); final String commandTimeoutStr = fessConfig.getSystemProperty("thumbnail.command.timeout"); if (commandTimeoutStr != null) { - commandTimeout = Long.valueOf(commandTimeoutStr); + commandTimeout = Long.parseLong(commandTimeoutStr); } final String commandDestroyTimeoutStr = fessConfig.getSystemProperty("thumbnail.command.destroy.timeout"); if (commandDestroyTimeoutStr != null) { - commandDestroyTimeout = Long.valueOf(commandDestroyTimeoutStr); + commandDestroyTimeout = Long.parseLong(commandDestroyTimeoutStr); } } diff --git a/src/main/java/org/codelibs/fess/timer/MonitorTarget.java b/src/main/java/org/codelibs/fess/timer/MonitorTarget.java index e6749551c5..126650f5c2 100644 --- a/src/main/java/org/codelibs/fess/timer/MonitorTarget.java +++ b/src/main/java/org/codelibs/fess/timer/MonitorTarget.java @@ -37,8 +37,8 @@ protected StringBuilder append(final StringBuilder buf, final String key, final final Object value = supplier.get(); if (value == null) { tempBuf.append("null"); - } else if ((value instanceof Integer) || (value instanceof Long)) { - tempBuf.append((value)); + } else if (value instanceof Integer || value instanceof Long) { + tempBuf.append(value); } else if (value instanceof Short) { tempBuf.append(((Short) value).shortValue()); } else if (value instanceof double[]) { diff --git a/src/main/java/org/codelibs/fess/util/PrunedTag.java b/src/main/java/org/codelibs/fess/util/PrunedTag.java index 9e712e8114..91e384430b 100644 --- a/src/main/java/org/codelibs/fess/util/PrunedTag.java +++ b/src/main/java/org/codelibs/fess/util/PrunedTag.java @@ -78,7 +78,7 @@ public boolean equals(final Object obj) { if (this == obj) { return true; } - if ((obj == null) || (getClass() != obj.getClass())) { + if (obj == null || getClass() != obj.getClass()) { return false; } final PrunedTag other = (PrunedTag) obj; @@ -98,8 +98,8 @@ public void setCss(final String css) { } public void setAttr(final String name, final String value) { - this.attrName = name; - this.attrValue = value; + attrName = name; + attrValue = value; } @Override diff --git a/src/main/java/org/codelibs/fess/util/QueryResponseList.java b/src/main/java/org/codelibs/fess/util/QueryResponseList.java index df361bf840..b246344740 100644 --- a/src/main/java/org/codelibs/fess/util/QueryResponseList.java +++ b/src/main/java/org/codelibs/fess/util/QueryResponseList.java @@ -64,7 +64,7 @@ public class QueryResponseList implements List> { // for testing protected QueryResponseList(final List> documentList, final int start, final int pageSize, final int offset) { - this.parent = documentList; + parent = documentList; this.offset = offset; this.start = start; this.pageSize = pageSize; diff --git a/src/main/java/org/codelibs/fess/util/RenderDataUtil.java b/src/main/java/org/codelibs/fess/util/RenderDataUtil.java index 95442258ab..8977a1fdd4 100644 --- a/src/main/java/org/codelibs/fess/util/RenderDataUtil.java +++ b/src/main/java/org/codelibs/fess/util/RenderDataUtil.java @@ -33,7 +33,7 @@ public static void register(final RenderData data, final String key, final Objec if (value instanceof Entity) { data.register(key, BeanUtil.copyBeanToNewMap(value)); } else { - if ((value instanceof final Collection coll) && !coll.isEmpty()) { + if (value instanceof final Collection coll && !coll.isEmpty()) { // care performance for List that the most frequent pattern final Object first = coll instanceof List ? ((List) coll).get(0) : coll.iterator().next(); if (first instanceof Entity) { diff --git a/src/main/java/org/codelibs/fess/util/ResourceUtil.java b/src/main/java/org/codelibs/fess/util/ResourceUtil.java index 63248858bd..e30ed5b135 100644 --- a/src/main/java/org/codelibs/fess/util/ResourceUtil.java +++ b/src/main/java/org/codelibs/fess/util/ResourceUtil.java @@ -148,7 +148,7 @@ protected static Path getPath(final String root, final String base, final String try { final ServletContext servletContext = ComponentUtil.getComponent(ServletContext.class); final String webinfPath = servletContext.getRealPath("/" + root + base); - if ((webinfPath != null) && Files.exists(Paths.get(webinfPath))) { + if (webinfPath != null && Files.exists(Paths.get(webinfPath))) { return Paths.get(webinfPath, names); } } catch (final Throwable e) { diff --git a/src/test/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticatorTest.java b/src/test/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticatorTest.java index 1219c35b0f..fbea590783 100644 --- a/src/test/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticatorTest.java +++ b/src/test/java/org/codelibs/fess/sso/oic/OpenIdConnectAuthenticatorTest.java @@ -21,14 +21,17 @@ import java.util.HashMap; import java.util.Map; +import org.codelibs.fess.app.web.base.login.OpenIdConnectCredential; import org.codelibs.fess.unit.UnitFessTestCase; +import org.codelibs.fess.util.DocumentUtil; public class OpenIdConnectAuthenticatorTest extends UnitFessTestCase { public void test_parseJwtClaim() throws IOException { // Setup OpenIdConnectAuthenticator authenticator = new OpenIdConnectAuthenticator(); final Map attributes = new HashMap<>(); - String jwtClaim = "{\"sub\":\"1234567890\",\"name\":\"John Doe\",\"groups\":[\"group1\",\"group2\"]}"; + String jwtClaim = + "{\"email\":\"test@codelibs.org\",\"sub\":\"1234567890\",\"name\":\"John Doe\",\"groups\":[\"group1\",\"group2\"]}"; // Execute authenticator.parseJwtClaim(jwtClaim, attributes); @@ -38,9 +41,11 @@ public void test_parseJwtClaim() throws IOException { assertEquals("John Doe", attributes.get("name")); // Check groups array - assertTrue(attributes.get("groups") instanceof String[]); - String[] groupArray = (String[]) attributes.get("groups"); - assertArrayEquals(new String[] { "group1", "group2" }, groupArray); + final String[] groups = DocumentUtil.getValue(attributes, "groups", String[].class); + assertArrayEquals(new String[] { "group1", "group2" }, groups); + OpenIdConnectCredential credential = new OpenIdConnectCredential(attributes); + assertEquals("test@codelibs.org", credential.getUserId()); + assertArrayEquals(new String[] { "group1", "group2" }, credential.getUserGroups()); } } From 265bbda820abb584c09d979ca510228fb903d1a5 Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Sat, 12 Oct 2024 10:54:15 +0900 Subject: [PATCH 68/69] #2848 Refactor code: reverted to an if statement. --- .../fess/api/json/SearchApiManager.java | 20 ++-- .../web/admin/backup/AdminBackupAction.java | 14 +-- .../admin/scheduler/AdminSchedulerAction.java | 12 +- .../web/admin/upgrade/AdminUpgradeAction.java | 109 ++++++------------ .../admin/backup/ApiAdminBackupAction.java | 14 +-- .../fess/es/config/exentity/DataConfig.java | 17 +-- .../es/config/exentity/WebAuthentication.java | 14 +-- .../fess/mylasta/direction/FessProp.java | 11 +- .../codelibs/fess/query/TermQueryCommand.java | 11 +- .../fess/sso/spnego/SpnegoAuthenticator.java | 40 ++++--- 10 files changed, 108 insertions(+), 154 deletions(-) diff --git a/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java b/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java index 415df554a9..23696b105e 100644 --- a/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java +++ b/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java @@ -120,8 +120,7 @@ protected FormatType detectFormatType(final HttpServletRequest request) { return FormatType.SEARCH; } final String type = value.toLowerCase(Locale.ROOT); - switch (type) { - case "documents": + if ("documents".equals(type)) { if (values.length > 5 && "favorite".equals(values[5])) { request.setAttribute(DOC_ID_FIELD, values[4]); return FormatType.FAVORITE; @@ -130,18 +129,21 @@ protected FormatType detectFormatType(final HttpServletRequest request) { return FormatType.SCROLL; } return FormatType.SEARCH; - case "labels": + } + if ("labels".equals(type)) { return FormatType.LABEL; - case "popular-words": + } + if ("popular-words".equals(type)) { return FormatType.POPULARWORD; - case "favorites": + } + if ("favorites".equals(type)) { return FormatType.FAVORITES; - case "health": + } + if ("health".equals(type)) { return FormatType.PING; - case "suggest-words": + } + if ("suggest-words".equals(type)) { return FormatType.SUGGEST; - default: - break; } // default return FormatType.OTHER; 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 ca2a8abf31..b238a07d1a 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 @@ -319,17 +319,17 @@ public ActionResponse download(final String id) { } if (id.endsWith(NDJSON_EXTENTION)) { final String name = id.substring(0, id.length() - NDJSON_EXTENTION.length()); - switch (name) { - case "search_log": + if ("search_log".equals(name)) { return writeNdjsonResponse(id, getSearchLogNdjsonWriteCall()); - case "user_info": + } + if ("user_info".equals(name)) { return writeNdjsonResponse(id, getUserInfoNdjsonWriteCall()); - case "click_log": + } + if ("click_log".equals(name)) { return writeNdjsonResponse(id, getClickLogNdjsonWriteCall()); - case "favorite_log": + } + if ("favorite_log".equals(name)) { return writeNdjsonResponse(id, getFavoriteLogNdjsonWriteCall()); - default: - break; } } else if ("fess.json".equals(id)) { return asStream(id).contentTypeOctetStream().stream(out -> { 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 ca520826db..9b9c6ac4e1 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 @@ -144,18 +144,12 @@ public HtmlResponse createnewjob(final String type, final String id, final Strin final String decodedName = new String(Base64.getUrlDecoder().decode(name), Constants.CHARSET_UTF_8); scheduledJobForm.name = MessageFormat.format(fessConfig.getJobTemplateTitle(type), decodedName); final String[] ids = { "", "", "" }; - switch (type) { - case Constants.WEB_CRAWLER_TYPE: + if (Constants.WEB_CRAWLER_TYPE.equals(type)) { ids[0] = "\"" + id + "\""; - break; - case Constants.FILE_CRAWLER_TYPE: + } else if (Constants.FILE_CRAWLER_TYPE.equals(type)) { ids[1] = "\"" + id + "\""; - break; - case Constants.DATA_CRAWLER_TYPE: + } else if (Constants.DATA_CRAWLER_TYPE.equals(type)) { ids[2] = "\"" + id + "\""; - break; - default: - break; } scheduledJobForm.scriptData = MessageFormat.format(fessConfig.getJobTemplateScript(), ids[0], ids[1], ids[2], id.replace('-', '_')); 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 993441aa99..7d0b3967d9 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 @@ -191,8 +191,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { validate(form, messages -> {}, this::asIndexHtml); verifyToken(this::asIndexHtml); - switch (form.targetVersion) { - case VERSION_13_0: + if (VERSION_13_0.equals(form.targetVersion)) { try { upgradeFrom13_0(); upgradeFrom13_1(); @@ -237,8 +236,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_0, e.getLocalizedMessage())); } - break; - case VERSION_13_1: + } else if (VERSION_13_1.equals(form.targetVersion)) { try { upgradeFrom13_1(); upgradeFrom13_2(); @@ -283,8 +281,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_1, e.getLocalizedMessage())); } - break; - case VERSION_13_2: + } else if (VERSION_13_2.equals(form.targetVersion)) { try { upgradeFrom13_2(); upgradeFrom13_3(); @@ -328,8 +325,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_2, e.getLocalizedMessage())); } - break; - case VERSION_13_3: + } else if (VERSION_13_3.equals(form.targetVersion)) { try { upgradeFrom13_3(); upgradeFrom13_4(); @@ -372,8 +368,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_3, e.getLocalizedMessage())); } - break; - case VERSION_13_4: + } else if (VERSION_13_4.equals(form.targetVersion)) { try { upgradeFrom13_4(); upgradeFrom13_5(); @@ -415,8 +410,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_4, e.getLocalizedMessage())); } - break; - case VERSION_13_5: + } else if (VERSION_13_5.equals(form.targetVersion)) { try { upgradeFrom13_5(); upgradeFrom13_6(); @@ -457,8 +451,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_5, e.getLocalizedMessage())); } - break; - case VERSION_13_6: + } else if (VERSION_13_6.equals(form.targetVersion)) { try { upgradeFrom13_6(); upgradeFrom13_7(); @@ -498,8 +491,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_6, e.getLocalizedMessage())); } - break; - case VERSION_13_7: + } else if (VERSION_13_7.equals(form.targetVersion)) { try { upgradeFrom13_7(); upgradeFrom13_8(); @@ -538,8 +530,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_7, e.getLocalizedMessage())); } - break; - case VERSION_13_8: + } else if (VERSION_13_8.equals(form.targetVersion)) { try { upgradeFrom13_8(); upgradeFrom13_9(); @@ -577,8 +568,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_8, e.getLocalizedMessage())); } - break; - case VERSION_13_9: + } else if (VERSION_13_9.equals(form.targetVersion)) { try { upgradeFrom13_9(); upgradeFrom13_10(); @@ -615,8 +605,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_9, e.getLocalizedMessage())); } - break; - case VERSION_13_10: + } else if (VERSION_13_10.equals(form.targetVersion)) { try { upgradeFrom13_10(); upgradeFrom13_11(); @@ -652,8 +641,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_10, e.getLocalizedMessage())); } - break; - case VERSION_13_11: + } else if (VERSION_13_11.equals(form.targetVersion)) { try { upgradeFrom13_11(); upgradeFrom13_12(); @@ -687,8 +675,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_11, e.getLocalizedMessage())); } - break; - case VERSION_13_12: + } else if (VERSION_13_12.equals(form.targetVersion)) { try { upgradeFrom13_12(); upgradeFrom13_13(); @@ -721,8 +708,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_12, e.getLocalizedMessage())); } - break; - case VERSION_13_13: + } else if (VERSION_13_13.equals(form.targetVersion)) { try { upgradeFrom13_13(); upgradeFrom13_14(); @@ -754,8 +740,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_13, e.getLocalizedMessage())); } - break; - case VERSION_13_14: + } else if (VERSION_13_14.equals(form.targetVersion)) { try { upgradeFrom13_14(); upgradeFrom13_15(); @@ -786,8 +771,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_14, e.getLocalizedMessage())); } - break; - case VERSION_13_15: + } else if (VERSION_13_15.equals(form.targetVersion)) { try { upgradeFrom13_15(); upgradeFrom13_16(); @@ -818,8 +802,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_15, e.getLocalizedMessage())); } - break; - case VERSION_13_16: + } else if (VERSION_13_16.equals(form.targetVersion)) { try { upgradeFrom13_16(); upgradeFrom13_17(); @@ -849,8 +832,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_16, e.getLocalizedMessage())); } - break; - case VERSION_13_17: + } else if (VERSION_13_17.equals(form.targetVersion)) { try { upgradeFrom13_17(); upgradeFrom14_0(); @@ -879,8 +861,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_17, e.getLocalizedMessage())); } - break; - case VERSION_14_0: + } else if (VERSION_14_0.equals(form.targetVersion)) { try { upgradeFrom14_0(); upgradeFrom14_1(); @@ -908,8 +889,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_0, e.getLocalizedMessage())); } - break; - case VERSION_14_1: + } else if (VERSION_14_1.equals(form.targetVersion)) { try { upgradeFrom14_1(); upgradeFrom14_2(); @@ -936,8 +916,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_1, e.getLocalizedMessage())); } - break; - case VERSION_14_2: + } else if (VERSION_14_2.equals(form.targetVersion)) { try { upgradeFrom14_2(); upgradeFrom14_3(); @@ -963,8 +942,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_2, e.getLocalizedMessage())); } - break; - case VERSION_14_3: + } else if (VERSION_14_3.equals(form.targetVersion)) { try { upgradeFrom14_3(); upgradeFrom14_4(); @@ -989,8 +967,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_3, e.getLocalizedMessage())); } - break; - case VERSION_14_4: + } else if (VERSION_14_4.equals(form.targetVersion)) { try { upgradeFrom14_4(); upgradeFrom14_5(); @@ -1014,8 +991,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_4, e.getLocalizedMessage())); } - break; - case VERSION_14_5: + } else if (VERSION_14_5.equals(form.targetVersion)) { try { upgradeFrom14_5(); upgradeFrom14_6(); @@ -1038,8 +1014,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_5, e.getLocalizedMessage())); } - break; - case VERSION_14_6: + } else if (VERSION_14_6.equals(form.targetVersion)) { try { upgradeFrom14_6(); upgradeFrom14_7(); @@ -1061,8 +1036,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_6, e.getLocalizedMessage())); } - break; - case VERSION_14_7: + } else if (VERSION_14_7.equals(form.targetVersion)) { try { upgradeFrom14_7(); upgradeFrom14_8(); @@ -1083,8 +1057,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_7, e.getLocalizedMessage())); } - break; - case VERSION_14_8: + } else if (VERSION_14_8.equals(form.targetVersion)) { try { upgradeFrom14_8(); upgradeFrom14_9(); @@ -1104,8 +1077,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_8, e.getLocalizedMessage())); } - break; - case VERSION_14_9: + } else if (VERSION_14_9.equals(form.targetVersion)) { try { upgradeFrom14_9(); upgradeFrom14_10(); @@ -1124,8 +1096,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_9, e.getLocalizedMessage())); } - break; - case VERSION_14_10: + } else if (VERSION_14_10.equals(form.targetVersion)) { try { upgradeFrom14_10(); upgradeFrom14_11(); @@ -1143,8 +1114,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_10, e.getLocalizedMessage())); } - break; - case VERSION_14_11: + } else if (VERSION_14_11.equals(form.targetVersion)) { try { upgradeFrom14_11(); upgradeFrom14_12(); @@ -1161,8 +1131,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_11, e.getLocalizedMessage())); } - break; - case VERSION_14_12: + } else if (VERSION_14_12.equals(form.targetVersion)) { try { upgradeFrom14_12(); upgradeFrom14_13(); @@ -1178,8 +1147,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_12, e.getLocalizedMessage())); } - break; - case VERSION_14_13: + } else if (VERSION_14_13.equals(form.targetVersion)) { try { upgradeFrom14_13(); upgradeFrom14_14(); @@ -1194,8 +1162,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_13, e.getLocalizedMessage())); } - break; - case VERSION_14_14: + } else if (VERSION_14_14.equals(form.targetVersion)) { try { upgradeFrom14_14(); upgradeFrom14_15(); @@ -1209,8 +1176,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_14, e.getLocalizedMessage())); } - break; - case VERSION_14_15: + } else if (VERSION_14_15.equals(form.targetVersion)) { try { upgradeFrom14_15(); upgradeFrom14_16(); @@ -1223,8 +1189,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_15, e.getLocalizedMessage())); } - break; - case VERSION_14_16: + } else if (VERSION_14_16.equals(form.targetVersion)) { try { upgradeFrom14_16(); upgradeFromAll(); @@ -1236,10 +1201,8 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_16, e.getLocalizedMessage())); } - break; - default: + } else { saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL)); - break; } return redirect(getClass()); } 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 c21a0adf52..b373f1a0dc 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 @@ -102,17 +102,17 @@ public JsonResponse files() { }); } final String name = id.substring(0, id.length() - NDJSON_EXTENTION.length()); - switch (name) { - case "search_log": + if ("search_log".equals(name)) { return writeNdjsonResponse(id, getSearchLogNdjsonWriteCall()); - case "user_info": + } + if ("user_info".equals(name)) { return writeNdjsonResponse(id, getUserInfoNdjsonWriteCall()); - case "click_log": + } + if ("click_log".equals(name)) { return writeNdjsonResponse(id, getClickLogNdjsonWriteCall()); - case "favorite_log": + } + if ("favorite_log".equals(name)) { return writeNdjsonResponse(id, getFavoriteLogNdjsonWriteCall()); - default: - break; } } 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 d0a3c26e2a..548a61bbe4 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 @@ -299,30 +299,21 @@ public CrawlerClientFactory initializeClientFactory(final Supplier paramMap, final String webAuthName, final String scheme) { AuthScheme authScheme = null; - switch (scheme) { - case Constants.BASIC: + if (Constants.BASIC.equals(scheme)) { authScheme = new BasicScheme(); - break; - case Constants.DIGEST: + } else if (Constants.DIGEST.equals(scheme)) { authScheme = new DigestScheme(); - break; - case Constants.NTLM: { + } else if (Constants.NTLM.equals(scheme)) { final Properties props = new Properties(); paramMap.entrySet().stream().filter(e -> e.getKey().startsWith("jcifs.")).forEach(e -> { props.setProperty(e.getKey(), e.getValue()); }); authScheme = new NTLMScheme(new JcifsEngine(props)); - break; - } - case Constants.FORM: { + } else if (Constants.FORM.equals(scheme)) { final String prefix = CRAWLER_WEB_AUTH + "." + webAuthName + "."; final Map 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); - break; - } - default: - break; } return authScheme; } 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 cd60ad4252..2422291154 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 @@ -59,12 +59,13 @@ public Authentication getAuthentication() { private AuthScheme getAuthScheme() { final String scheme = getProtocolScheme(); - switch (scheme) { - case Constants.BASIC: + if (Constants.BASIC.equals(scheme)) { return new BasicScheme(); - case Constants.DIGEST: + } + if (Constants.DIGEST.equals(scheme)) { return new DigestScheme(); - case Constants.NTLM: { + } + if (Constants.NTLM.equals(scheme)) { final Properties props = new Properties(); getWebConfig().getConfigParameterMap(ConfigName.CONFIG).entrySet().stream() .filter(e -> e.getKey().startsWith(Config.JCIFS_PREFIX)).forEach(e -> { @@ -72,13 +73,10 @@ private AuthScheme getAuthScheme() { }); return new NTLMScheme(new JcifsEngine(props)); } - case Constants.FORM: { + if (Constants.FORM.equals(scheme)) { final Map parameterMap = ParameterUtil.parse(getParameters()); return new FormScheme(parameterMap); } - default: - break; - } return null; } 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 baa4f75143..41d7cc52ce 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java @@ -909,15 +909,14 @@ default String[] getSupportedUploadedMediaExtentionsAsArray() { String getJobTemplateTitleData(); default String getJobTemplateTitle(final String type) { - switch (type) { - case Constants.WEB_CRAWLER_TYPE: + if (Constants.WEB_CRAWLER_TYPE.equals(type)) { return getJobTemplateTitleWeb(); - case Constants.FILE_CRAWLER_TYPE: + } + if (Constants.FILE_CRAWLER_TYPE.equals(type)) { return getJobTemplateTitleFile(); - case Constants.DATA_CRAWLER_TYPE: + } + if (Constants.DATA_CRAWLER_TYPE.equals(type)) { return getJobTemplateTitleData(); - default: - break; } return "None"; } diff --git a/src/main/java/org/codelibs/fess/query/TermQueryCommand.java b/src/main/java/org/codelibs/fess/query/TermQueryCommand.java index 1b8b5d9599..8aa63cc1af 100644 --- a/src/main/java/org/codelibs/fess/query/TermQueryCommand.java +++ b/src/main/java/org/codelibs/fess/query/TermQueryCommand.java @@ -72,15 +72,14 @@ protected QueryBuilder convertTermQuery(final FessConfig fessConfig, final Query if (fessConfig.getQueryReplaceTermWithPrefixQueryAsBoolean() && text.length() > 1 && text.endsWith("*")) { return convertPrefixQuery(fessConfig, context, termQuery, boost, field, text); } - switch (field) { - case DEFAULT_FIELD: + if (DEFAULT_FIELD.equals(field)) { return convertDefaultTermQuery(fessConfig, context, termQuery, boost, field, text); - case SORT_FIELD: + } + if (SORT_FIELD.equals(field)) { return convertSortQuery(fessConfig, context, termQuery, boost, field, text); - case SITE_FIELD: + } + if (SITE_FIELD.equals(field)) { return convertSiteQuery(fessConfig, context, termQuery, boost, field, text); - default: - break; } if (INURL_FIELD.equals(field) || StringUtil.equals(field, context.getDefaultField()) && fessConfig.getIndexFieldUrl().equals(context.getDefaultField())) { 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 97601462b1..fbcd8582d6 100644 --- a/src/main/java/org/codelibs/fess/sso/spnego/SpnegoAuthenticator.java +++ b/src/main/java/org/codelibs/fess/sso/spnego/SpnegoAuthenticator.java @@ -173,8 +173,7 @@ public ServletContext getServletContext() { @Override public String getInitParameter(final String name) { - switch (name) { - case SpnegoHttpFilter.Constants.LOGGER_LEVEL: { + if (SpnegoHttpFilter.Constants.LOGGER_LEVEL.equals(name)) { final String logLevel = getProperty(SPNEGO_LOGGER_LEVEL, StringUtil.EMPTY); if (StringUtil.isNotBlank(logLevel)) { return logLevel; @@ -193,32 +192,41 @@ public String getInitParameter(final String name) { } return "0"; } - case SpnegoHttpFilter.Constants.LOGIN_CONF: + if (SpnegoHttpFilter.Constants.LOGIN_CONF.equals(name)) { return getResourcePath(getProperty(SPNEGO_LOGIN_CONF, "auth_login.conf")); - case SpnegoHttpFilter.Constants.KRB5_CONF: + } + if (SpnegoHttpFilter.Constants.KRB5_CONF.equals(name)) { return getResourcePath(getProperty(SPNEGO_KRB5_CONF, "krb5.conf")); - case SpnegoHttpFilter.Constants.CLIENT_MODULE: + } + if (SpnegoHttpFilter.Constants.CLIENT_MODULE.equals(name)) { return getProperty(SPNEGO_LOGIN_CLIENT_MODULE, "spnego-client"); - case SpnegoHttpFilter.Constants.SERVER_MODULE: + } + if (SpnegoHttpFilter.Constants.SERVER_MODULE.equals(name)) { return getProperty(SPNEGO_LOGIN_SERVER_MODULE, "spnego-server"); - case SpnegoHttpFilter.Constants.PREAUTH_USERNAME: + } + if (SpnegoHttpFilter.Constants.PREAUTH_USERNAME.equals(name)) { return getProperty(SPNEGO_PREAUTH_USERNAME, "username"); - case SpnegoHttpFilter.Constants.PREAUTH_PASSWORD: + } + if (SpnegoHttpFilter.Constants.PREAUTH_PASSWORD.equals(name)) { return getProperty(SPNEGO_PREAUTH_PASSWORD, "password"); - case SpnegoHttpFilter.Constants.ALLOW_BASIC: + } + if (SpnegoHttpFilter.Constants.ALLOW_BASIC.equals(name)) { return getProperty(SPNEGO_ALLOW_BASIC, "true"); - case SpnegoHttpFilter.Constants.ALLOW_UNSEC_BASIC: + } + if (SpnegoHttpFilter.Constants.ALLOW_UNSEC_BASIC.equals(name)) { return getProperty(SPNEGO_ALLOW_UNSECURE_BASIC, "true"); - case SpnegoHttpFilter.Constants.PROMPT_NTLM: + } + if (SpnegoHttpFilter.Constants.PROMPT_NTLM.equals(name)) { return getProperty(SPNEGO_PROMPT_NTLM, "true"); - case SpnegoHttpFilter.Constants.ALLOW_LOCALHOST: + } + if (SpnegoHttpFilter.Constants.ALLOW_LOCALHOST.equals(name)) { return getProperty(SPNEGO_ALLOW_LOCALHOST, "true"); - case SpnegoHttpFilter.Constants.ALLOW_DELEGATION: + } + if (SpnegoHttpFilter.Constants.ALLOW_DELEGATION.equals(name)) { return getProperty(SPNEGO_ALLOW_DELEGATION, "false"); - case SpnegoHttpFilter.Constants.EXCLUDE_DIRS: + } + if (SpnegoHttpFilter.Constants.EXCLUDE_DIRS.equals(name)) { return getProperty(SPNEGO_EXCLUDE_DIRS, StringUtil.EMPTY); - default: - break; } return null; } From 9f56ad5ccf4cb7a197dd4c41406315651a57e63a Mon Sep 17 00:00:00 2001 From: Shinsuke Sugaya Date: Sat, 12 Oct 2024 16:22:40 +0900 Subject: [PATCH 69/69] update docs --- README.fr.md | 173 ------------------------------------------- README.md | 23 +++--- docs/de/README.md | 159 +++++++++++++++++++++++++++++++++++++++ docs/es/README.md | 159 +++++++++++++++++++++++++++++++++++++++ docs/fr/README.md | 169 ++++++++++++++++++++++++++++++++++++++++++ docs/ja/README.md | 158 +++++++++++++++++++++++++++++++++++++++ docs/ko/README.md | 158 +++++++++++++++++++++++++++++++++++++++ docs/pt-BR/README.md | 159 +++++++++++++++++++++++++++++++++++++++ docs/zh-CN/README.md | 158 +++++++++++++++++++++++++++++++++++++++ 9 files changed, 1131 insertions(+), 185 deletions(-) delete mode 100644 README.fr.md create mode 100644 docs/de/README.md create mode 100644 docs/es/README.md create mode 100644 docs/fr/README.md create mode 100644 docs/ja/README.md create mode 100644 docs/ko/README.md create mode 100644 docs/pt-BR/README.md create mode 100644 docs/zh-CN/README.md diff --git a/README.fr.md b/README.fr.md deleted file mode 100644 index 148504ded2..0000000000 --- a/README.fr.md +++ /dev/null @@ -1,173 +0,0 @@ -Fess Enterprise Search Server [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Fess+is+very+powerful+and+easily+deployable+Enterprise+Search+Server.&url=https://github.com/codelibs/fess) -==== -[![Java CI avec Maven](https://github.com/codelibs/fess/actions/workflows/maven.yml/badge.svg)](https://github.com/codelibs/fess/actions/workflows/maven.yml) -[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.codelibs.fess/fess/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.codelibs.fess/fess) -[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/gitbucket/gitbucket/blob/master/LICENSE) - -## Overview - -Fess est un serveur de moteur de recherche très puissant et facile à déployer en entreprise. -Vous pouvez rapidement l'installer et l'exécuter sur toute plateforme qui propose l'environnement Java Runtime. Fess est distribué sous [License Apache 2.0](LICENSE). - -Fess est basé sur [OpenSearch](https://github.com/opensearch-project/OpenSearch)/[Elasticsearch](https://github.com/elastic/elasticsearch), mais il _ne_ requiert _PAS_ connaissance ou expérience avec les solutions OpenSearch et Elasticsearch. Fess fourni une interface d'administration simple pour configurer le système via votre navigateur. -Fess comprend aussi un Crawler, qui peut explorer les documents d'un [serveur Web](https://fess.codelibs.org/14.6/admin/webconfig-guide.html), un [système de fichiers](https://fess.codelibs.org/14.6/admin/fileconfig-guide.html), ou un [Stockage de données](https://fess.codelibs.org/14.6/admin/dataconfig-guide.html) (tel qu'une base de donnée ou des CSV). Plusieurs formats de fichiers sont supportés tels que (mais pas uniquement): Microsoft Office, PDF, et zip. - -*[FEss Site Search](https://github.com/codelibs/fess-site-search)* est une alternative libre à [Google Site Search](https://enterprise.google.com/search/products/gss.html). Pour plus de détails, jetez un oeil à [FSS JS Generator documentation](https://fss-generator.codelibs.org/docs/manual). - -## Website - -[fess.codelibs.org](https://fess.codelibs.org/) - -## Incidents/Questions - -[discuss.codelibs.org](https://discuss.codelibs.org/c/FessEN/) - -## Pour démarrer - -Il y a 2 façons d'essayer Fess. La première est de télécharger et l'installer vous-même. La seconde étant d'utiliser [Docker](https://www.docker.com/products/docker-engine). - -### Télécharger, installer, lancer - -La dernière version de Fess est maintenant disponible et peut être téléchargée sur la [page des releases](https://github.com/codelibs/fess/releases "download"). 3 formats vous sont proposés : deb, rpm, zip. - -Les commandes suivantes montre comment utiliser la version zip: - - $ unzip fess-14.6.x.zip - $ cd fess-14.6.x - $ ./bin/fess - -Pour plus de détails, consultez le [guide d'installation](https://fess.codelibs.org/14.6/install/index.html). - -### Docker - -Nous fournissions des images docker sur [ghcr.io](https://github.com/orgs/codelibs/packages). -Nous proposons aussi un fichier Docker Compose (YAML) dans [ce repository](https://github.com/codelibs/docker-fess/tree/master/compose). - -### Interfaces Web - -- Interface de recherche : http://localhost:8080/ - -![Interface de recherche](https://fess.codelibs.org/_images/fess_search_result1.png) - -- Interface d'administration : http://localhost:8080/admin/ (identifiant et mot de passe à l'installation : admin/admin) - -![Interface d'administration](https://fess.codelibs.org/_images/fess_admin_dashboard.png) - -Vous pouvez définir les cibles à indexer (Web, Fichiers, stockage de données) dans les pages de configuration de l'exploration de l'interface d'administration, et lancer manuellement l'exploration sur la [page de planification](https://fess.codelibs.org/14.6/admin/scheduler-guide.html). - -## Migration depuis un autre moteur de recherche - -Détaillé sur la page [MIGRATION.md](MIGRATION.md). - -## Stockages de données - -Actuellement, Fess supporte l'exploration des [emplacements de stockage et APIs](https://fess.codelibs.org/14.6/admin/dataconfig-guide.html) suivantes: - - - [Confluence/Jira](https://github.com/codelibs/fess-ds-atlassian) - - [Box](https://github.com/codelibs/fess-ds-box) - - [CSV](https://github.com/codelibs/fess-ds-csv) - - [Database](https://github.com/codelibs/fess-ds-db) - - [Dropbox](https://github.com/codelibs/fess-ds-dropbox) - - [Elasticsearch](https://github.com/codelibs/fess-ds-elasticsearch) - - [Git](https://github.com/codelibs/fess-ds-git) - - [Gitbucket](https://github.com/codelibs/fess-ds-gitbucket) - - [G Suite](https://github.com/codelibs/fess-ds-gsuite) - - [JSON](https://github.com/codelibs/fess-ds-json) - - [Office 365](https://github.com/codelibs/fess-ds-office365) - - [S3](https://github.com/codelibs/fess-ds-s3) - - [Salesforce](https://github.com/codelibs/fess-ds-salesforce) - - [SharePoint](https://github.com/codelibs/fess-ds-sharepoint) - - [Slack](https://github.com/codelibs/fess-ds-slack) - -## Thèmes - - - [Simple](https://github.com/codelibs/fess-theme-simple) - - [Classic](https://github.com/codelibs/fess-theme-classic) - -## Ingest - - - [Logger](https://github.com/codelibs/fess-ingest-logger) - - [NDJSON](https://github.com/codelibs/fess-ingest-ndjson) - -## Script - - - [Groovy](https://github.com/codelibs/fess-script-groovy) - - [OGNL](https://github.com/codelibs/fess-script-ognl) - -## Localisation - -### Japonnaise - - - [Website](https://fess.codelibs.org/ja/) - -### Coréenne - - - [Forum](https://github.com/nocode2k/fess-kr-forum) - -## Information de Développement - -### Récuperer le code Source - -1. Cloner le dépôt Fess: - ``` - $ cd ~/workspace - $ git clone https://github.com/codelibs/fess.git - ``` - -2. Importer le dépot cloné comme projet [Maven](https://maven.apache.org/) dans [Eclipse](https://www.eclipse.org/eclipseide/) ou un autre IDE. - -### Mettre en place les plugins OpenSearch - -Exécuter antrun:run pour récupérer les plugins dans le répertoire des plugins : - - $ mvn antrun:run - -### Éxecuter Fess - -Exécuter ou debugger org.codelibs.fess.FessBoot dans votre IDE, et aller sur http://localhost:8080/ - -### Construire le Package - -Éxecuter le `package` et ensuite livrer le fichier créé dans target/releases. - - $ mvn package - $ mvn rpm:rpm # .rpm package - $ mvn jdeb:jdeb # .deb package - -### Générer le code Source - - $ mvn dbflute:download # (one time command) - $ mvn dbflute:freegen - $ mvn license:format - -### Test d'integration - -Lancer le serveur Fess et éxécuter la commande suivante : - - $ mvn test -P integrationTests -Dtest.fess.url="http://localhost:8080" -Dtest.search_engine.url="http://localhost:9201" - -Pour exécuter un seul cas de test case, vous pouvez utiliser la commande suivante : - - $ mvn test -P integrationTests -Dtest.fess.url="http://localhost:8080" -Dtest.search_engine.url="http://localhost:9201" -Dtest=SearchApiTests - -### Traduire dans d'autres (votre) langue - -Fess est internationalisé. - -Si vous voulez les messages et labels dans votre langue, vous pouvez dupliquer et renommer en suivant le format fess\_\*\_[lang].properties et en traduire le contenu. - -* [fess_label_en.properties](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_label_en.properties) -* [fess_message_en.properties](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_message_en.properties) - -Pour l'analyseur de recherche et indexation, si [doc.json](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_indices/fess/doc.json) contient lang\_[lang] pour votre langue, veuillez modifier l'analyseur pour votre langue. Pour plus d'information à propos des Analyzers, veuillez consulter la [documentaion d'Elasticsearch](https://www.elastic.co/guide/en/elasticsearch/reference/current/analysis-analyzers.html). - -Nous acceuillons avec plaisir les pull request pour votre langue. - -## Powered By - -* [Lasta Di](https://github.com/lastaflute/lasta-di "Lasta Di"): Conteneur DI -* [LastaFlute](https://github.com/lastaflute/lastaflute "LastaFlute"): Framework Web -* [Lasta Job](https://github.com/lastaflute/lasta-job "Lasta Job"): Planificateur de tâches -* [Fess Crawler](https://github.com/codelibs/fess-crawler "Fess Crawler"): Explorateur Web -* [OpenSearch](https://opensearch.org/ "OpenSearch"): Moteur de recherche -* [Elasticsearch](https://github.com/elastic/elasticsearch "Elasticsearch"): Moteur de recherche diff --git a/README.md b/README.md index f3e77f36f1..fc6eddca7b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -Fess Enterprise Search Server [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Fess+is+very+powerful+and+easily+deployable+Enterprise+Search+Server.&url=https://github.com/codelibs/fess) -==== +# Fess: Enterprise Search Server [![Java CI with Maven](https://github.com/codelibs/fess/actions/workflows/maven.yml/badge.svg)](https://github.com/codelibs/fess/actions/workflows/maven.yml) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.codelibs.fess/fess/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.codelibs.fess/fess) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/gitbucket/gitbucket/blob/master/LICENSE) @@ -92,16 +91,6 @@ Currently, Fess supports crawling the following [storage locations and APIs](htt - [Groovy](https://github.com/codelibs/fess-script-groovy) - [OGNL](https://github.com/codelibs/fess-script-ognl) -## Localization - -### Japanese - - - [Website](https://fess.codelibs.org/ja/) - -### Korean - - - [Forum](https://github.com/nocode2k/fess-kr-forum) - ## Development Information ### Get Source Code @@ -161,6 +150,16 @@ For search/index analyzer, if [doc.json](https://github.com/codelibs/fess/blob/m We welcome pull requests for your language. +### Translations + +- [日本語 (Japanese)](docs/ja/README.md) +- [简体中文 (Simplified Chinese)](docs/zh-CN/README.md) +- [Español (Spanish)](docs/es/README.md) +- [Português (Brazilian Portuguese)](docs/pt-BR/README.md) +- [Français (French)](docs/fr/README.md) +- [Deutsch (German)](docs/de/README.md) +- [한국어 (Korean)](docs/ko/README.md) + ## Powered By * [Lasta Di](https://github.com/lastaflute/lasta-di "Lasta Di"): DI Container diff --git a/docs/de/README.md b/docs/de/README.md new file mode 100644 index 0000000000..a1c79502ed --- /dev/null +++ b/docs/de/README.md @@ -0,0 +1,159 @@ +# Fess: Enterprise-Suchserver +[![Java CI with Maven](https://github.com/codelibs/fess/actions/workflows/maven.yml/badge.svg)](https://github.com/codelibs/fess/actions/workflows/maven.yml) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.codelibs.fess/fess/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.codelibs.fess/fess) +[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/gitbucket/gitbucket/blob/master/LICENSE) + +## Übersicht + +Fess ist ein sehr leistungsstarker und einfach zu implementierender Enterprise-Suchserver. Sie können Fess schnell auf jeder Plattform installieren und ausführen, auf der die Java-Laufzeitumgebung (JRE) läuft. Fess wird unter der [Apache-Lizenz 2.0](LICENSE) bereitgestellt. + +Fess basiert auf [OpenSearch](https://github.com/opensearch-project/OpenSearch), aber es ist kein Wissen oder Erfahrung mit OpenSearch erforderlich. Fess bietet eine einfach zu bedienende Administrations-GUI zur Konfiguration des Systems über Ihren Browser. +Fess enthält auch einen Crawler, der Dokumente auf einem [Webserver](https://fess.codelibs.org/14.17/admin/webconfig-guide.html), [Dateisystem](https://fess.codelibs.org/14.17/admin/fileconfig-guide.html) oder [Datenspeicher](https://fess.codelibs.org/14.17/admin/dataconfig-guide.html) (wie CSV oder Datenbank) durchsuchen kann. Viele Dateiformate werden unterstützt, einschließlich (aber nicht beschränkt auf): Microsoft Office, PDF und zip. + +*[Fess Site Search](https://github.com/codelibs/fess-site-search)* ist eine kostenlose Alternative zur [Google Site Search](https://enterprise.google.com/search/products/gss.html). Weitere Details finden Sie in der [Dokumentation des FSS JS Generators](https://fss-generator.codelibs.org/docs/manual). + +## Website + +[fess.codelibs.org](https://fess.codelibs.org/) + +## Probleme/Fragen + +[discuss.codelibs.org](https://discuss.codelibs.org/c/FessEN/) + +## Erste Schritte + +Es gibt zwei Möglichkeiten, Fess auszuprobieren. Die erste besteht darin, es selbst herunterzuladen und zu installieren. Die zweite besteht darin, [Docker](https://www.docker.com/products/docker-engine) zu verwenden. + +### Herunterladen und Installieren/Ausführen + +Fess 14.17 ist jetzt verfügbar und kann auf der [Release-Seite](https://github.com/codelibs/fess/releases "download") heruntergeladen werden. Downloads gibt es in drei Formaten: deb, rpm, zip. + +Die folgenden Befehle zeigen, wie der Zip-Download verwendet wird: + + $ unzip fess-14.17.x.zip + $ cd fess-14.17.x + $ ./bin/fess + +Weitere Informationen finden Sie im [Installationshandbuch](https://fess.codelibs.org/14.17/install/index.html). + +### Docker + +Wir bieten Docker-Images auf [ghcr.io](https://github.com/orgs/codelibs/packages) an. Wir stellen auch eine Docker Compose (YAML)-Datei in [diesem Repository](https://github.com/codelibs/docker-fess/tree/master/compose) bereit. + +### Browser-Benutzeroberfläche + +- Suchoberfläche: http://localhost:8080/ + +![Suchoberfläche](https://fess.codelibs.org/_images/fess_search_result1.png) + +- Administrationsoberfläche: http://localhost:8080/admin/ (Standard-Benutzername/Passwort ist admin/admin) + +![Administrationsoberfläche](https://fess.codelibs.org/_images/fess_admin_dashboard.png) + +Sie können in der Administrationsoberfläche (Web, Datei, Datenspeicher) Crawling-Ziele in den Crawler-Konfigurationsseiten registrieren und den Crawler manuell auf der [Scheduler-Seite](https://fess.codelibs.org/14.17/admin/scheduler-guide.html) starten. + +## Migration von einem anderen Suchanbieter + +Bitte lesen Sie [MIGRATION.md](MIGRATION.md). + +## Datenspeicher + +Derzeit unterstützt Fess das Crawlen der folgenden [Speicherorte und APIs](https://fess.codelibs.org/14.17/admin/dataconfig-guide.html): + + - [Confluence/Jira](https://github.com/codelibs/fess-ds-atlassian) + - [Box](https://github.com/codelibs/fess-ds-box) + - [CSV](https://github.com/codelibs/fess-ds-csv) + - [Datenbank](https://github.com/codelibs/fess-ds-db) + - [Dropbox](https://github.com/codelibs/fess-ds-dropbox) + - [Elasticsearch](https://github.com/codelibs/fess-ds-elasticsearch) + - [Git](https://github.com/codelibs/fess-ds-git) + - [Gitbucket](https://github.com/codelibs/fess-ds-gitbucket) + - [G Suite](https://github.com/codelibs/fess-ds-gsuite) + - [JSON](https://github.com/codelibs/fess-ds-json) + - [Office 365](https://github.com/codelibs/fess-ds-office365) + - [S3](https://github.com/codelibs/fess-ds-s3) + - [Salesforce](https://github.com/codelibs/fess-ds-salesforce) + - [SharePoint](https://github.com/codelibs/fess-ds-sharepoint) + - [Slack](https://github.com/codelibs/fess-ds-slack) + +## Themen + + - [Simple](https://github.com/codelibs/fess-theme-simple) + - [Classic](https://github.com/codelibs/fess-theme-classic) + +## Ingest + + - [Logger](https://github.com/codelibs/fess-ingest-logger) + - [NDJSON](https://github.com/codelibs/fess-ingest-ndjson) + +## Skript + + - [Groovy](https://github.com/codelibs/fess-script-groovy) + - [OGNL](https://github.com/codelibs/fess-script-ognl) + +## Entwicklungsinformationen + +### Quellcode abrufen + +1. Klonen Sie das Fess-Repository: + ``` + $ cd ~/workspace + $ git clone https://github.com/codelibs/fess.git + ``` + +2. Importieren Sie das geklonte Repository als ein [Maven](https://maven.apache.org/) Projekt in [Eclipse](https://www.eclipse.org/eclipseide/) oder einer anderen IDE. + +### Einrichten von OpenSearch-Plugins + +Führen Sie antrun:run aus, um Plugins in das Plugins-Verzeichnis herunterzuladen: + + $ mvn antrun:run + +### Fess ausführen + +Führen Sie `org.codelibs.fess.FessBoot` in Ihrer IDE aus oder debuggen Sie es und greifen Sie dann auf http://localhost:8080/ zu. + +### Paket erstellen + +Führen Sie das `package`-Ziel aus, und dann wird die Release-Datei im Verzeichnis target/releases erstellt. + + $ mvn package + $ mvn rpm:rpm # .rpm-Paket + $ mvn jdeb:jdeb # .deb-Paket + +### Quellcode generieren + + $ mvn dbflute:download # (einmaliger Befehl) + $ mvn dbflute:freegen + $ mvn license:format + +### Integrationstests + +Starten Sie den Fess-Server und führen Sie den folgenden Befehl aus: + + $ mvn test -P integrationTests -Dtest.fess.url="http://localhost:8080" -Dtest.search_engine.url="http://localhost:9201" + +Um einen einzelnen Testfall auszuführen, können Sie verwenden: + + $ mvn test -P integrationTests -Dtest.fess.url="http://localhost:8080" -Dtest.search_engine.url="http://localhost:9201" -Dtest=SearchApiTests + +### In Ihre Sprache übersetzen + +Fess ist eine internationalisierte Software. + +Wenn Sie Labels/Nachrichten für Ihre Sprache hinzufügen möchten, übersetzen Sie bitte die Eigenschaftendatei und benennen Sie sie in fess\_\*\_[lang].properties um. + +* [fess_label_en.properties](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_label_en.properties) +* [fess_message_en.properties](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_message_en.properties) + +Für den Such-/Index-Analyser: Wenn [doc.json](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_indices/fess/doc.json) lang\_[lang] für Ihre Sprache enthält, passen Sie bitte den Analyser für Ihre Sprache an. Weitere Informationen zu Analysatoren finden Sie in der [OpenSearch-Dokumentation](https://opensearch.org/docs/latest/analyzers/search-analyzers/). + +Wir begrüßen Pull-Requests für Ihre Sprache. + +## Unterstützt von + +* [Lasta Di](https://github.com/lastaflute/lasta-di "Lasta Di"): DI-Container +* [LastaFlute](https://github.com/lastaflute/lastaflute "LastaFlute"): Web-Framework +* [Lasta Job](https://github.com/lastaflute/lasta-job "Lasta Job"): Job-Scheduler +* [Fess Crawler](https://github.com/codelibs/fess-crawler "Fess Crawler"): Web-Crawler +* [OpenSearch](https://opensearch.org/ "OpenSearch"): Suchmaschine diff --git a/docs/es/README.md b/docs/es/README.md new file mode 100644 index 0000000000..836a5cd01b --- /dev/null +++ b/docs/es/README.md @@ -0,0 +1,159 @@ +# Fess: Servidor de Búsqueda Empresarial +[![Java CI with Maven](https://github.com/codelibs/fess/actions/workflows/maven.yml/badge.svg)](https://github.com/codelibs/fess/actions/workflows/maven.yml) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.codelibs.fess/fess/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.codelibs.fess/fess) +[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/gitbucket/gitbucket/blob/master/LICENSE) + +## Resumen + +Fess es un servidor de búsqueda empresarial muy potente y fácil de desplegar. Puedes instalar y ejecutar Fess rápidamente en cualquier plataforma que sea capaz de ejecutar el entorno de ejecución de Java (Java Runtime Environment). Fess se distribuye bajo la [Licencia Apache 2.0](LICENSE). + +Fess está basado en [OpenSearch](https://github.com/opensearch-project/OpenSearch), pero no se requiere conocimiento o experiencia en OpenSearch. Fess proporciona una GUI de administración fácil de usar para configurar el sistema a través de tu navegador. +Fess también incluye un rastreador (crawler), que puede rastrear documentos en un [servidor web](https://fess.codelibs.org/14.17/admin/webconfig-guide.html), [sistema de archivos](https://fess.codelibs.org/14.17/admin/fileconfig-guide.html), o [almacenamiento de datos](https://fess.codelibs.org/14.17/admin/dataconfig-guide.html) (como un archivo CSV o base de datos). Se admiten muchos formatos de archivos, incluidos (pero no limitados a): Microsoft Office, PDF y zip. + +*[Fess Site Search](https://github.com/codelibs/fess-site-search)* es una alternativa gratuita a [Google Site Search](https://enterprise.google.com/search/products/gss.html). Para más detalles, consulta la [documentación de FSS JS Generator](https://fss-generator.codelibs.org/docs/manual). + +## Sitio web + +[fess.codelibs.org](https://fess.codelibs.org/) + +## Problemas/Preguntas + +[discuss.codelibs.org](https://discuss.codelibs.org/c/FessEN/) + +## Cómo Empezar + +Hay dos maneras de probar Fess. La primera es descargar e instalarlo tú mismo. La segunda es usar [Docker](https://www.docker.com/products/docker-engine). + +### Descargar e Instalar/Ejecutar + +Fess 14.17 ya está disponible y se puede descargar en la [página de lanzamientos](https://github.com/codelibs/fess/releases "download"). Las descargas están disponibles en 3 formatos: deb, rpm y zip. + +Los siguientes comandos muestran cómo usar la descarga en formato zip: + + $ unzip fess-14.17.x.zip + $ cd fess-14.17.x + $ ./bin/fess + +Para más detalles, consulta la [Guía de Instalación](https://fess.codelibs.org/14.17/install/index.html). + +### Docker + +Proporcionamos imágenes de Docker en [ghcr.io](https://github.com/orgs/codelibs/packages). También proporcionamos un archivo Docker Compose (YAML) en [este repositorio](https://github.com/codelibs/docker-fess/tree/master/compose). + +### Interfaz de Usuario en el Navegador + +- Interfaz de búsqueda: http://localhost:8080/ + +![Interfaz de Búsqueda](https://fess.codelibs.org/_images/fess_search_result1.png) + +- Interfaz de administración: http://localhost:8080/admin/ (el nombre de usuario/contraseña por defecto es admin/admin) + +![Interfaz de Administración](https://fess.codelibs.org/_images/fess_admin_dashboard.png) + +Puedes registrar los objetivos de rastreo en la interfaz de administración en las páginas de configuración del rastreador (Web, Archivo, Almacenamiento de Datos), y luego iniciar el rastreador manualmente en la [página del Programador](https://fess.codelibs.org/14.17/admin/scheduler-guide.html). + +## Migración desde otro proveedor de búsqueda + +Consulta [MIGRATION.md](MIGRATION.md). + +## Almacenamiento de Datos + +Actualmente, Fess admite el rastreo de las siguientes [ubicaciones de almacenamiento y APIs](https://fess.codelibs.org/14.17/admin/dataconfig-guide.html): + + - [Confluence/Jira](https://github.com/codelibs/fess-ds-atlassian) + - [Box](https://github.com/codelibs/fess-ds-box) + - [CSV](https://github.com/codelibs/fess-ds-csv) + - [Database](https://github.com/codelibs/fess-ds-db) + - [Dropbox](https://github.com/codelibs/fess-ds-dropbox) + - [Elasticsearch](https://github.com/codelibs/fess-ds-elasticsearch) + - [Git](https://github.com/codelibs/fess-ds-git) + - [Gitbucket](https://github.com/codelibs/fess-ds-gitbucket) + - [G Suite](https://github.com/codelibs/fess-ds-gsuite) + - [JSON](https://github.com/codelibs/fess-ds-json) + - [Office 365](https://github.com/codelibs/fess-ds-office365) + - [S3](https://github.com/codelibs/fess-ds-s3) + - [Salesforce](https://github.com/codelibs/fess-ds-salesforce) + - [SharePoint](https://github.com/codelibs/fess-ds-sharepoint) + - [Slack](https://github.com/codelibs/fess-ds-slack) + +## Tema + + - [Simple](https://github.com/codelibs/fess-theme-simple) + - [Classic](https://github.com/codelibs/fess-theme-classic) + +## Ingesta + + - [Logger](https://github.com/codelibs/fess-ingest-logger) + - [NDJSON](https://github.com/codelibs/fess-ingest-ndjson) + +## Script + + - [Groovy](https://github.com/codelibs/fess-script-groovy) + - [OGNL](https://github.com/codelibs/fess-script-ognl) + +## Información de Desarrollo + +### Obtener el Código Fuente + +1. Clona el repositorio de Fess: + ``` + $ cd ~/workspace + $ git clone https://github.com/codelibs/fess.git + ``` + +2. Importa el repositorio clonado como un proyecto [Maven](https://maven.apache.org/) en [Eclipse](https://www.eclipse.org/eclipseide/) u otro IDE. + +### Configuración de Plugins para OpenSearch + +Ejecuta antrun:run para descargar los plugins en el directorio de plugins: + + $ mvn antrun:run + +### Ejecutar Fess + +Ejecuta o depura `org.codelibs.fess.FessBoot` en tu IDE, y luego accede a http://localhost:8080/ + +### Construir el Paquete + +Ejecuta el objetivo `package` y luego se creará el archivo de lanzamiento en target/releases. + + $ mvn package + $ mvn rpm:rpm # Paquete .rpm + $ mvn jdeb:jdeb # Paquete .deb + +### Generar Código Fuente + + $ mvn dbflute:download # (comando ejecutado una sola vez) + $ mvn dbflute:freegen + $ mvn license:format + +### Pruebas de Integración + +Inicia el servidor Fess y ejecuta el siguiente comando: + + $ mvn test -P integrationTests -Dtest.fess.url="http://localhost:8080" -Dtest.search_engine.url="http://localhost:9201" + +Para ejecutar un único caso de prueba, puedes usar: + + $ mvn test -P integrationTests -Dtest.fess.url="http://localhost:8080" -Dtest.search_engine.url="http://localhost:9201" -Dtest=SearchApiTests + +### Traducir a Tu Idioma + +Fess es un software internacionalizado. + +Si deseas agregar etiquetas/mensajes para tu idioma, por favor traduce el archivo de propiedades y renómbralo a fess\_\*\_[lang].properties. + +* [fess_label_en.properties](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_label_en.properties) +* [fess_message_en.properties](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_message_en.properties) + +Para el analizador de búsqueda/índices, si [doc.json](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_indices/fess/doc.json) contiene lang\_[lang] para tu idioma, por favor modifica el analizador para tu idioma. Para más detalles sobre los analizadores, consulta la [documentación de OpenSearch](https://opensearch.org/docs/latest/analyzers/search-analyzers/). + +Damos la bienvenida a pull requests para tu idioma. + +## Impulsado por + +* [Lasta Di](https://github.com/lastaflute/lasta-di "Lasta Di"): Contenedor DI +* [LastaFlute](https://github.com/lastaflute/lastaflute "LastaFlute"): Framework Web +* [Lasta Job](https://github.com/lastaflute/lasta-job "Lasta Job"): Programador de Tareas +* [Fess Crawler](https://github.com/codelibs/fess-crawler "Fess Crawler"): Rastreador Web +* [OpenSearch](https://opensearch.org/ "OpenSearch"): Motor de Búsqueda diff --git a/docs/fr/README.md b/docs/fr/README.md new file mode 100644 index 0000000000..7df7ae8ca6 --- /dev/null +++ b/docs/fr/README.md @@ -0,0 +1,169 @@ +# Fess : Serveur de recherche pour entreprises +[![Java CI with Maven](https://github.com/codelibs/fess/actions/workflows/maven.yml/badge.svg)](https://github.com/codelibs/fess/actions/workflows/maven.yml) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.codelibs.fess/fess/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.codelibs.fess/fess) +[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/gitbucket/gitbucket/blob/master/LICENSE) + +## Vue d'ensemble + +Fess est un serveur de recherche très puissant et facilement déployable pour les entreprises. Vous pouvez rapidement installer et exécuter Fess sur toute plateforme où vous pouvez exécuter l'environnement d'exécution Java. Fess est fourni sous la licence [Apache License 2.0](LICENSE). + +Fess est basé sur [OpenSearch](https://github.com/opensearch-project/OpenSearch), mais aucune connaissance ni expérience d'OpenSearch n'est _nécessaire_. Fess fournit une interface d'administration facile à utiliser pour configurer le système via votre navigateur. +Fess comprend également un Crawler, capable d'explorer les documents sur un [serveur web](https://fess.codelibs.org/14.17/admin/webconfig-guide.html), un [système de fichiers](https://fess.codelibs.org/14.17/admin/fileconfig-guide.html), ou un [Data Store](https://fess.codelibs.org/14.17/admin/dataconfig-guide.html) (comme un fichier CSV ou une base de données). De nombreux formats de fichiers sont pris en charge, y compris (mais sans s'y limiter) : Microsoft Office, PDF, et zip. + +*[Fess Site Search](https://github.com/codelibs/fess-site-search)* est une alternative gratuite à [Google Site Search](https://enterprise.google.com/search/products/gss.html). Pour plus de détails, consultez la [documentation FSS JS Generator](https://fss-generator.codelibs.org/docs/manual). + +## Site Web + +[fess.codelibs.org](https://fess.codelibs.org/) + +## Problèmes/Questions + +[discuss.codelibs.org](https://discuss.codelibs.org/c/FessEN/) + +## Démarrage rapide + +Il existe 2 manières d'essayer Fess. La première est de le télécharger et l'installer vous-même. La seconde est d'utiliser [Docker](https://www.docker.com/products/docker-engine). + +### Télécharger et Installer/Exécuter + +Fess 14.17 est désormais disponible et peut être téléchargé sur la [page de Releases](https://github.com/codelibs/fess/releases "download"). Les téléchargements sont disponibles en 3 formats : deb, rpm, zip. + +Les commandes suivantes montrent comment utiliser le téléchargement zip : + + $ unzip fess-14.17.x.zip + $ cd fess-14.17.x + $ ./bin/fess + +Pour plus de détails, consultez le [guide d'installation](https://fess.codelibs.org/14.17/install/index.html). + +### Docker + +Nous fournissons des images Docker sur [ghcr.io](https://github.com/orgs/codelibs/packages). Nous fournissons également un fichier Docker Compose (YAML) dans [ce dépôt](https://github.com/codelibs/docker-fess/tree/master/compose). + +### Interface Web + +- Interface de recherche : http://localhost:8080/ + +![Search UI](https://fess.codelibs.org/_images/fess_search_result1.png) + +- Interface d'administration : http://localhost:8080/admin/ (nom d'utilisateur/mot de passe par défaut : admin/admin) + +![Admin UI](https://fess.codelibs.org/_images/fess_admin_dashboard.png) + +Vous pouvez enregistrer des cibles à explorer dans l'interface d'administration sur les pages de configuration des crawlers (Web, Fichiers, Data Store), puis démarrer manuellement le Crawler sur la [page du Planificateur](https://fess.codelibs.org/14.17/admin/scheduler-guide.html). + +## Migration depuis un autre fournisseur de recherche + +Veuillez consulter [MIGRATION.md](MIGRATION.md). + +## Data Store + +Actuellement, Fess prend en charge le parcours des [emplacements de stockage et API](https://fess.codelibs.org/14.17/admin/dataconfig-guide.html) suivants : + + - [Confluence/Jira](https://github.com/codelibs/fess-ds-atlassian) + - [Box](https://github.com/codelibs/fess-ds-box) + - [CSV](https://github.com/codelibs/fess-ds-csv) + - [Base de données](https://github.com/codelibs/fess-ds-db) + - [Dropbox](https://github.com/codelibs/fess-ds-dropbox) + - [Elasticsearch](https://github.com/codelibs/fess-ds-elasticsearch) + - [Git](https://github.com/codelibs/fess-ds-git) + - [Gitbucket](https://github.com/codelibs/fess-ds-gitbucket) + - [G Suite](https://github.com/codelibs/fess-ds-gsuite) + - [JSON](https://github.com/codelibs/fess-ds-json) + - [Office 365](https://github.com/codelibs/fess-ds-office365) + - [S3](https://github.com/codelibs/fess-ds-s3) + - [Salesforce](https://github.com/codelibs/fess-ds-salesforce) + - [SharePoint](https://github.com/codelibs/fess-ds-sharepoint) + - [Slack](https://github.com/codelibs/fess-ds-slack) + +## Thèmes + + - [Simple](https://github.com/codelibs/fess-theme-simple) + - [Classique](https://github.com/codelibs/fess-theme-classic) + +## Ingest + + - [Logger](https://github.com/codelibs/fess-ingest-logger) + - [NDJSON](https://github.com/codelibs/fess-ingest-ndjson) + +## Scripts + + - [Groovy](https://github.com/codelibs/fess-script-groovy) + - [OGNL](https://github.com/codelibs/fess-script-ognl) + +## Localisation + +### Japonais + + - [Site Web](https://fess.codelibs.org/ja/) + +### Coréen + + - [Forum](https://github.com/nocode2k/fess-kr-forum) + +## Informations de Développement + +### Récupérer le Code Source + +1. Clonez le dépôt Fess : + ``` + $ cd ~/workspace + $ git clone https://github.com/codelibs/fess.git + ``` + +2. Importez le dépôt cloné en tant que projet [Maven](https://maven.apache.org/) sur [Eclipse](https://www.eclipse.org/eclipseide/) ou un autre IDE. + +### Configuration pour les Plugins OpenSearch + +Exécutez antrun:run pour télécharger les plugins dans le répertoire plugins : + + $ mvn antrun:run + +### Exécuter Fess + +Exécutez ou déboguez org.codelibs.fess.FessBoot dans votre IDE, puis accédez à http://localhost:8080/ + +### Créer un Package + +Exécutez la commande `package` et le fichier de release sera créé dans target/releases. + + $ mvn package + $ mvn rpm:rpm # package .rpm + $ mvn jdeb:jdeb # package .deb + +### Générer le Code Source + + $ mvn dbflute:download # (commande unique) + $ mvn dbflute:freegen + $ mvn license:format + +### Tests d'Intégration + +Lancez le serveur Fess et exécutez la commande suivante : + + $ mvn test -P integrationTests -Dtest.fess.url="http://localhost:8080" -Dtest.search_engine.url="http://localhost:9201" + +Pour exécuter un seul cas de test, vous pouvez utiliser : + + $ mvn test -P integrationTests -Dtest.fess.url="http://localhost:8080" -Dtest.search_engine.url="http://localhost:9201" -Dtest=SearchApiTests + +### Traduire dans Votre Langue + +Fess est un logiciel internationalisé. + +Si vous souhaitez ajouter des libellés/messages pour votre langue, veuillez traduire le fichier de propriétés et le renommer en fess\_\*\_[lang].properties. + +* [fess_label_en.properties](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_label_en.properties) +* [fess_message_en.properties](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_message_en.properties) + +Pour l'analyseur de recherche/index, si [doc.json](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_indices/fess/doc.json) contient lang\_[lang] pour votre langue, veuillez modifier l'analyseur pour votre langue. Pour plus de détails sur les analyseurs, consultez la [documentation OpenSearch](https://opensearch.org/docs/latest/analyzers/search-analyzers/). + +Nous accueillons les pull requests pour votre langue. + +## Alimenté par + +* [Lasta Di](https://github.com/lastaflute/lasta-di "Lasta Di") : Conteneur DI +* [LastaFlute](https://github.com/lastaflute/lastaflute "LastaFlute") : Framework Web +* [Lasta Job](https://github.com/lastaflute/lasta-job "Lasta Job") : Planificateur de tâches +* [Fess Crawler](https://github.com/codelibs/fess-crawler "Fess Crawler") : Crawler Web +* [OpenSearch](https://opensearch.org/ "OpenSearch") : Moteur de recherche diff --git a/docs/ja/README.md b/docs/ja/README.md new file mode 100644 index 0000000000..e5297f9071 --- /dev/null +++ b/docs/ja/README.md @@ -0,0 +1,158 @@ +# Fess: エンタープライズ検索サーバー +[![Java CI with Maven](https://github.com/codelibs/fess/actions/workflows/maven.yml/badge.svg)](https://github.com/codelibs/fess/actions/workflows/maven.yml) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.codelibs.fess/fess/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.codelibs.fess/fess) +[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/gitbucket/gitbucket/blob/master/LICENSE) + +## 概要 + +Fessは非常に強力で、簡単に導入できるエンタープライズ検索サーバーです。FessはJavaランタイム環境が動作する任意のプラットフォーム上で簡単にインストールして実行できます。Fessは[Apache License 2.0](LICENSE)の下で提供されています。 + +Fessは[OpenSearch](https://github.com/opensearch-project/OpenSearch)をベースにしていますが、OpenSearchに関する知識や経験は**不要**です。Fessは、ブラウザを介してシステムを簡単に設定できる管理者向けのGUIを提供しています。Fessにはクローラも含まれており、[Webサーバー](https://fess.codelibs.org/14.17/admin/webconfig-guide.html)、[ファイルシステム](https://fess.codelibs.org/14.17/admin/fileconfig-guide.html)、または[データストア](https://fess.codelibs.org/14.17/admin/dataconfig-guide.html)（CSVやデータベースなど）のドキュメントをクロールできます。Microsoft Office、PDF、zipなど、多くのファイル形式に対応しています。 + +*[Fess Site Search](https://github.com/codelibs/fess-site-search)*は、[Google Site Search](https://enterprise.google.com/search/products/gss.html)の無料代替です。詳細については、[FSS JS Generatorのドキュメント](https://fss-generator.codelibs.org/docs/manual)を参照してください。 + +## 公式サイト + +[fess.codelibs.org](https://fess.codelibs.org/) + +## 問題や質問 + +[discuss.codelibs.org](https://discuss.codelibs.org/c/FessEN/) + +## はじめに + +Fessを試す方法は2つあります。1つは自分でダウンロードしてインストールする方法、もう1つは[Docker](https://www.docker.com/products/docker-engine)を使用する方法です。 + +### ダウンロードおよびインストール/実行 + +Fess 14.17が利用可能で、[リリースページ](https://github.com/codelibs/fess/releases "download")からダウンロードできます。ダウンロードには、deb、rpm、zipの3つの形式があります。 + +以下のコマンドは、zipファイルを使用する例です： + + $ unzip fess-14.17.x.zip + $ cd fess-14.17.x + $ ./bin/fess + +詳細については、[インストールガイド](https://fess.codelibs.org/14.17/install/index.html)を参照してください。 + +### Docker + +[ghcr.io](https://github.com/orgs/codelibs/packages)にDockerイメージを提供しています。また、このリポジトリにはDocker Compose（YAML）ファイルも用意されています。[こちらのリポジトリ](https://github.com/codelibs/docker-fess/tree/master/compose)で確認できます。 + +### ブラウザUI + +- 検索UI: http://localhost:8080/ + +![Search UI](https://fess.codelibs.org/_images/fess_search_result1.png) + +- 管理者UI: http://localhost:8080/admin/ （デフォルトのユーザー名/パスワードはadmin/adminです） + +![Admin UI](https://fess.codelibs.org/_images/fess_admin_dashboard.png) + +管理者UIでは、（Web、ファイル、データストア）クローラの設定ページでクロール対象を登録し、[スケジューラページ](https://fess.codelibs.org/14.17/admin/scheduler-guide.html)から手動でクローラを開始できます。 + +## 他の検索プロバイダーからの移行 + +[MIGRATION.md](MIGRATION.md)を参照してください。 + +## データストア + +現在、Fessは以下の[ストレージロケーションとAPI](https://fess.codelibs.org/14.17/admin/dataconfig-guide.html)のクロールをサポートしています： + + - [Confluence/Jira](https://github.com/codelibs/fess-ds-atlassian) + - [Box](https://github.com/codelibs/fess-ds-box) + - [CSV](https://github.com/codelibs/fess-ds-csv) + - [Database](https://github.com/codelibs/fess-ds-db) + - [Dropbox](https://github.com/codelibs/fess-ds-dropbox) + - [Elasticsearch](https://github.com/codelibs/fess-ds-elasticsearch) + - [Git](https://github.com/codelibs/fess-ds-git) + - [Gitbucket](https://github.com/codelibs/fess-ds-gitbucket) + - [G Suite](https://github.com/codelibs/fess-ds-gsuite) + - [JSON](https://github.com/codelibs/fess-ds-json) + - [Office 365](https://github.com/codelibs/fess-ds-office365) + - [S3](https://github.com/codelibs/fess-ds-s3) + - [Salesforce](https://github.com/codelibs/fess-ds-salesforce) + - [SharePoint](https://github.com/codelibs/fess-ds-sharepoint) + - [Slack](https://github.com/codelibs/fess-ds-slack) + +## テーマ + + - [Simple](https://github.com/codelibs/fess-theme-simple) + - [Classic](https://github.com/codelibs/fess-theme-classic) + +## Ingest + + - [Logger](https://github.com/codelibs/fess-ingest-logger) + - [NDJSON](https://github.com/codelibs/fess-ingest-ndjson) + +## スクリプト + + - [Groovy](https://github.com/codelibs/fess-script-groovy) + - [OGNL](https://github.com/codelibs/fess-script-ognl) + +## 開発情報 + +### ソースコードの取得 + +1. Fessのリポジトリをクローンします： + ``` + $ cd ~/workspace + $ git clone https://github.com/codelibs/fess.git + ``` + +2. クローンしたリポジトリを、[Maven](https://maven.apache.org/)プロジェクトとして[Eclipse](https://www.eclipse.org/eclipseide/)や他のIDEにインポートします。 + +### OpenSearchプラグインのセットアップ + +antrun:runを実行して、プラグインをpluginsディレクトリにダウンロードします： + + $ mvn antrun:run + +### Fessの実行 + +IDE上で`org.codelibs.fess.FessBoot`を実行またはデバッグし、http://localhost:8080/ にアクセスします。 + +### パッケージのビルド + +`package`ゴールを実行すると、releaseファイルがtarget/releasesディレクトリに作成されます。 + + $ mvn package + $ mvn rpm:rpm # .rpmパッケージ + $ mvn jdeb:jdeb # .debパッケージ + +### ソースコードの生成 + + $ mvn dbflute:download # （一度だけ実行） + $ mvn dbflute:freegen + $ mvn license:format + +### 統合テスト + +Fessサーバーを起動し、以下のコマンドを実行します： + + $ mvn test -P integrationTests -Dtest.fess.url="http://localhost:8080" -Dtest.search_engine.url="http://localhost:9201" + +単一のテストケースを実行するには、以下のコマンドを使用できます： + + $ mvn test -P integrationTests -Dtest.fess.url="http://localhost:8080" -Dtest.search_engine.url="http://localhost:9201" -Dtest=SearchApiTests + +### あなたの言語への翻訳 + +Fessは国際化対応ソフトウェアです。 + +ラベルやメッセージをあなたの言語に追加したい場合、プロパティファイルを翻訳してから`fess\_\*\_[lang].properties`という名前に変更してください。 + +* [fess_label_en.properties](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_label_en.properties) +* [fess_message_en.properties](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_message_en.properties) + +検索/インデックスアナライザーの設定については、[doc.json](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_indices/fess/doc.json)に言語別の`lang\_[lang]`が含まれているか確認し、その言語に合わせてアナライザーを修正してください。アナライザーに関する詳細は、[OpenSearchのドキュメント](https://opensearch.org/docs/latest/analyzers/search-analyzers/)を参照してください。 + +私たちは、あなたの言語でのプルリクエストを歓迎します。 + +## Powered By + +* [Lasta Di](https://github.com/lastaflute/lasta-di "Lasta Di"): DIコンテナ +* [LastaFlute](https://github.com/lastaflute/lastaflute "LastaFlute"): Webフレームワーク +* [Lasta Job](https://github.com/lastaflute/lasta-job "Lasta Job"): ジョブスケジューラ +* [Fess Crawler](https://github.com/codelibs/fess-crawler "Fess Crawler"): Webクローラ +* [OpenSearch](https://opensearch.org/ "OpenSearch"): 検索エンジン diff --git a/docs/ko/README.md b/docs/ko/README.md new file mode 100644 index 0000000000..cdfaa0b53c --- /dev/null +++ b/docs/ko/README.md @@ -0,0 +1,158 @@ +# Fess: 엔터프라이즈 검색 서버 +[![Java CI with Maven](https://github.com/codelibs/fess/actions/workflows/maven.yml/badge.svg)](https://github.com/codelibs/fess/actions/workflows/maven.yml) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.codelibs.fess/fess/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.codelibs.fess/fess) +[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/gitbucket/gitbucket/blob/master/LICENSE) + +## 개요 + +Fess는 매우 강력하고 쉽게 배포 가능한 엔터프라이즈 검색 서버입니다. 자바 런타임 환경(Java Runtime Environment)을 실행할 수 있는 모든 플랫폼에서 Fess를 빠르게 설치하고 실행할 수 있습니다. Fess는 [Apache License 2.0](LICENSE)에 따라 제공됩니다. + +Fess는 [OpenSearch](https://github.com/opensearch-project/OpenSearch)를 기반으로 하지만, OpenSearch에 대한 지식이나 경험은 필요하지 않습니다. Fess는 브라우저를 통해 시스템을 구성할 수 있는 사용하기 쉬운 관리 GUI를 제공합니다. 또한 Fess는 [웹 서버](https://fess.codelibs.org/14.17/admin/webconfig-guide.html), [파일 시스템](https://fess.codelibs.org/14.17/admin/fileconfig-guide.html), 또는 [데이터 저장소](https://fess.codelibs.org/14.17/admin/dataconfig-guide.html)에서 문서를 크롤링할 수 있는 크롤러도 포함하고 있습니다(CSV 또는 데이터베이스와 같은). Microsoft Office, PDF, zip을 포함한 다양한 파일 형식을 지원합니다. + +*[Fess 사이트 검색](https://github.com/codelibs/fess-site-search)*은 [Google 사이트 검색](https://enterprise.google.com/search/products/gss.html)의 무료 대안입니다. 자세한 내용은 [FSS JS 생성기 문서](https://fss-generator.codelibs.org/docs/manual)를 참조하십시오. + +## 웹사이트 + +[fess.codelibs.org](https://fess.codelibs.org/) + +## 문제/질문 + +[discuss.codelibs.org](https://discuss.codelibs.org/c/FessEN/) + +## 시작하기 + +Fess를 사용해보는 방법은 두 가지가 있습니다. 첫 번째는 직접 다운로드하여 설치하는 방법이며, 두 번째는 [Docker](https://www.docker.com/products/docker-engine)를 사용하는 방법입니다. + +### 다운로드 및 설치/실행 + +Fess 14.17이 현재 사용 가능하며, [릴리스 페이지](https://github.com/codelibs/fess/releases "download")에서 다운로드할 수 있습니다. 다운로드는 deb, rpm, zip의 세 가지 형식으로 제공됩니다. + +다음 명령은 zip 다운로드 사용 방법을 보여줍니다: + + $ unzip fess-14.17.x.zip + $ cd fess-14.17.x + $ ./bin/fess + +자세한 내용은 [설치 가이드](https://fess.codelibs.org/14.17/install/index.html)를 참조하십시오. + +### Docker + +우리는 [ghcr.io](https://github.com/orgs/codelibs/packages)에서 Docker 이미지를 제공합니다. 또한 [이 리포지토리](https://github.com/codelibs/docker-fess/tree/master/compose)에 Docker Compose (YAML) 파일도 제공합니다. + +### 브라우저 UI + +- 검색 UI: http://localhost:8080/ + +![검색 UI](https://fess.codelibs.org/_images/fess_search_result1.png) + +- 관리자 UI: http://localhost:8080/admin/ (기본 사용자 이름/비밀번호는 admin/admin입니다) + +![관리자 UI](https://fess.codelibs.org/_images/fess_admin_dashboard.png) + +관리자 UI에서는 (웹, 파일, 데이터 저장소) 크롤러 구성 페이지에서 크롤링 대상을 등록한 다음, [스케줄러 페이지](https://fess.codelibs.org/14.17/admin/scheduler-guide.html)에서 크롤러를 수동으로 시작할 수 있습니다. + +## 다른 검색 제공자에서의 마이그레이션 + +[MIGRATION.md](MIGRATION.md)를 참조하십시오. + +## 데이터 저장소 + +현재 Fess는 다음 [저장소 위치 및 API](https://fess.codelibs.org/14.17/admin/dataconfig-guide.html)를 크롤링할 수 있습니다: + + - [Confluence/Jira](https://github.com/codelibs/fess-ds-atlassian) + - [Box](https://github.com/codelibs/fess-ds-box) + - [CSV](https://github.com/codelibs/fess-ds-csv) + - [Database](https://github.com/codelibs/fess-ds-db) + - [Dropbox](https://github.com/codelibs/fess-ds-dropbox) + - [Elasticsearch](https://github.com/codelibs/fess-ds-elasticsearch) + - [Git](https://github.com/codelibs/fess-ds-git) + - [Gitbucket](https://github.com/codelibs/fess-ds-gitbucket) + - [G Suite](https://github.com/codelibs/fess-ds-gsuite) + - [JSON](https://github.com/codelibs/fess-ds-json) + - [Office 365](https://github.com/codelibs/fess-ds-office365) + - [S3](https://github.com/codelibs/fess-ds-s3) + - [Salesforce](https://github.com/codelibs/fess-ds-salesforce) + - [SharePoint](https://github.com/codelibs/fess-ds-sharepoint) + - [Slack](https://github.com/codelibs/fess-ds-slack) + +## 테마 + + - [Simple](https://github.com/codelibs/fess-theme-simple) + - [Classic](https://github.com/codelibs/fess-theme-classic) + +## 인게스트 + + - [Logger](https://github.com/codelibs/fess-ingest-logger) + - [NDJSON](https://github.com/codelibs/fess-ingest-ndjson) + +## 스크립트 + + - [Groovy](https://github.com/codelibs/fess-script-groovy) + - [OGNL](https://github.com/codelibs/fess-script-ognl) + +## 개발 정보 + +### 소스 코드 얻기 + +1. Fess 리포지토리를 클론합니다: + ``` + $ cd ~/workspace + $ git clone https://github.com/codelibs/fess.git + ``` + +2. 클론한 리포지토리를 [Maven](https://maven.apache.org/) 프로젝트로 [Eclipse](https://www.eclipse.org/eclipseide/) 또는 다른 IDE에서 가져옵니다. + +### OpenSearch 플러그인 설정 + +antrun:run을 실행하여 플러그인을 플러그인 디렉토리에 다운로드합니다: + + $ mvn antrun:run + +### Fess 실행 + +IDE에서 `org.codelibs.fess.FessBoot`을 실행하거나 디버그하고 http://localhost:8080/에 접속합니다. + +### 패키지 빌드 + +`package` 목표를 실행하면 릴리스 파일이 target/releases 디렉토리에 생성됩니다. + + $ mvn package + $ mvn rpm:rpm # .rpm 패키지 + $ mvn jdeb:jdeb # .deb 패키지 + +### 소스 코드 생성 + + $ mvn dbflute:download # (한 번만 실행) + $ mvn dbflute:freegen + $ mvn license:format + +### 통합 테스트 + +Fess 서버를 시작하고 다음 명령을 실행합니다: + + $ mvn test -P integrationTests -Dtest.fess.url="http://localhost:8080" -Dtest.search_engine.url="http://localhost:9201" + +단일 테스트 케이스를 실행하려면 다음을 사용할 수 있습니다: + + $ mvn test -P integrationTests -Dtest.fess.url="http://localhost:8080" -Dtest.search_engine.url="http://localhost:9201" -Dtest=SearchApiTests + +### 언어 번역 + +Fess는 국제화된 소프트웨어입니다. + +귀하의 언어로 라벨/메시지를 추가하려면 속성 파일을 번역한 후 fess\_\*\_[lang].properties로 이름을 바꾸십시오. + +* [fess_label_en.properties](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_label_en.properties) +* [fess_message_en.properties](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_message_en.properties) + +검색/인덱스 분석기와 관련해서, [doc.json](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_indices/fess/doc.json)이 귀하의 언어에 대한 lang\_[lang]을 포함하는 경우, 해당 언어에 맞게 분석기를 수정하십시오. 분석기에 대한 자세한 내용은 [OpenSearch 문서](https://opensearch.org/docs/latest/analyzers/search-analyzers/)를 참조하십시오. + +귀하의 언어로 된 풀 리퀘스트를 환영합니다. + +## 제공된 기술 + +* [Lasta Di](https://github.com/lastaflute/lasta-di "Lasta Di"): DI 컨테이너 +* [LastaFlute](https://github.com/lastaflute/lastaflute "LastaFlute"): 웹 프레임워크 +* [Lasta Job](https://github.com/lastaflute/lasta-job "Lasta Job"): 작업 스케줄러 +* [Fess Crawler](https://github.com/codelibs/fess-crawler "Fess Crawler"): 웹 크롤러 +* [OpenSearch](https://opensearch.org/ "OpenSearch"): 검색 엔진 diff --git a/docs/pt-BR/README.md b/docs/pt-BR/README.md new file mode 100644 index 0000000000..4499b8c1ca --- /dev/null +++ b/docs/pt-BR/README.md @@ -0,0 +1,159 @@ +# Fess: Servidor de Busca Empresarial +[![Java CI with Maven](https://github.com/codelibs/fess/actions/workflows/maven.yml/badge.svg)](https://github.com/codelibs/fess/actions/workflows/maven.yml) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.codelibs.fess/fess/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.codelibs.fess/fess) +[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/gitbucket/gitbucket/blob/master/LICENSE) + +## Visão Geral + +Fess é um servidor de busca empresarial muito poderoso e fácil de implantar. Você pode instalar e executar o Fess rapidamente em qualquer plataforma que suporte o Java Runtime Environment. O Fess é fornecido sob a [Licença Apache 2.0](LICENSE). + +O Fess é baseado no [OpenSearch](https://github.com/opensearch-project/OpenSearch), mas não é necessário ter conhecimento ou experiência com OpenSearch. O Fess fornece uma interface de administração fácil de usar, que permite configurar o sistema através do seu navegador. +O Fess também inclui um rastreador (Crawler), que pode rastrear documentos em um [servidor web](https://fess.codelibs.org/14.17/admin/webconfig-guide.html), [sistema de arquivos](https://fess.codelibs.org/14.17/admin/fileconfig-guide.html) ou [Data Store](https://fess.codelibs.org/14.17/admin/dataconfig-guide.html) (como CSV ou banco de dados). Muitos formatos de arquivos são suportados, incluindo (mas não limitado a): Microsoft Office, PDF e zip. + +*[Fess Site Search](https://github.com/codelibs/fess-site-search)* é uma alternativa gratuita ao [Google Site Search](https://enterprise.google.com/search/products/gss.html). Para mais detalhes, veja a [documentação do FSS JS Generator](https://fss-generator.codelibs.org/docs/manual). + +## Site + +[fess.codelibs.org](https://fess.codelibs.org/) + +## Problemas/Perguntas + +[discuss.codelibs.org](https://discuss.codelibs.org/c/FessEN/) + +## Como Começar + +Existem duas maneiras de testar o Fess. A primeira é baixar e instalar você mesmo. A segunda é usar [Docker](https://www.docker.com/products/docker-engine). + +### Baixar e Instalar/Executar + +O Fess 14.17 já está disponível e pode ser baixado na [página de lançamentos](https://github.com/codelibs/fess/releases "download"). As opções de download incluem: deb, rpm, zip. + +Os comandos a seguir mostram como usar o download em formato zip: + + $ unzip fess-14.17.x.zip + $ cd fess-14.17.x + $ ./bin/fess + +Para mais detalhes, veja o [Guia de Instalação](https://fess.codelibs.org/14.17/install/index.html). + +### Docker + +Nós fornecemos imagens Docker em [ghcr.io](https://github.com/orgs/codelibs/packages). Também fornecemos um arquivo Docker Compose (YAML) neste [repositório](https://github.com/codelibs/docker-fess/tree/master/compose). + +### Interface do Navegador + +- Interface de Busca: http://localhost:8080/ + +![Interface de Busca](https://fess.codelibs.org/_images/fess_search_result1.png) + +- Interface de Administração: http://localhost:8080/admin/ (o nome de usuário/senha padrão é admin/admin) + +![Interface de Administração](https://fess.codelibs.org/_images/fess_admin_dashboard.png) + +Você pode registrar alvos de rastreamento na interface de administração nas páginas de configuração do rastreador (Web, Arquivo, Data Store), e iniciar manualmente o rastreador na [página do Agendador](https://fess.codelibs.org/14.17/admin/scheduler-guide.html). + +## Migração de Outro Provedor de Busca + +Consulte [MIGRATION.md](MIGRATION.md). + +## Data Store + +Atualmente, o Fess suporta o rastreamento dos seguintes [locais de armazenamento e APIs](https://fess.codelibs.org/14.17/admin/dataconfig-guide.html): + + - [Confluence/Jira](https://github.com/codelibs/fess-ds-atlassian) + - [Box](https://github.com/codelibs/fess-ds-box) + - [CSV](https://github.com/codelibs/fess-ds-csv) + - [Database](https://github.com/codelibs/fess-ds-db) + - [Dropbox](https://github.com/codelibs/fess-ds-dropbox) + - [Elasticsearch](https://github.com/codelibs/fess-ds-elasticsearch) + - [Git](https://github.com/codelibs/fess-ds-git) + - [Gitbucket](https://github.com/codelibs/fess-ds-gitbucket) + - [G Suite](https://github.com/codelibs/fess-ds-gsuite) + - [JSON](https://github.com/codelibs/fess-ds-json) + - [Office 365](https://github.com/codelibs/fess-ds-office365) + - [S3](https://github.com/codelibs/fess-ds-s3) + - [Salesforce](https://github.com/codelibs/fess-ds-salesforce) + - [SharePoint](https://github.com/codelibs/fess-ds-sharepoint) + - [Slack](https://github.com/codelibs/fess-ds-slack) + +## Temas + + - [Simple](https://github.com/codelibs/fess-theme-simple) + - [Classic](https://github.com/codelibs/fess-theme-classic) + +## Ingestão + + - [Logger](https://github.com/codelibs/fess-ingest-logger) + - [NDJSON](https://github.com/codelibs/fess-ingest-ndjson) + +## Scripts + + - [Groovy](https://github.com/codelibs/fess-script-groovy) + - [OGNL](https://github.com/codelibs/fess-script-ognl) + +## Informações de Desenvolvimento + +### Obter Código Fonte + +1. Clone o repositório do Fess: + ``` + $ cd ~/workspace + $ git clone https://github.com/codelibs/fess.git + ``` + +2. Importe o repositório clonado como um projeto [Maven](https://maven.apache.org/) no [Eclipse](https://www.eclipse.org/eclipseide/) ou em outro IDE. + +### Configuração de Plugins para OpenSearch + +Execute antrun:run para baixar os plugins no diretório de plugins: + + $ mvn antrun:run + +### Executar o Fess + +Execute ou depure `org.codelibs.fess.FessBoot` no seu IDE, e depois acesse http://localhost:8080/ + +### Criar Pacote + +Execute o objetivo `package` e o arquivo de lançamento será criado em target/releases. + + $ mvn package + $ mvn rpm:rpm # pacote .rpm + $ mvn jdeb:jdeb # pacote .deb + +### Gerar Código Fonte + + $ mvn dbflute:download # (comando executado uma vez) + $ mvn dbflute:freegen + $ mvn license:format + +### Testes de Integração + +Inicie o servidor Fess e execute o seguinte comando: + + $ mvn test -P integrationTests -Dtest.fess.url="http://localhost:8080" -Dtest.search_engine.url="http://localhost:9201" + +Para executar um único caso de teste, você pode usar: + + $ mvn test -P integrationTests -Dtest.fess.url="http://localhost:8080" -Dtest.search_engine.url="http://localhost:9201" -Dtest=SearchApiTests + +### Traduzir para o Seu Idioma + +Fess é um software internacionalizado. + +Se você quiser adicionar rótulos/mensagens para o seu idioma, por favor, traduza o arquivo de propriedades e renomeie-o para fess\_\*\_[lang].properties. + +* [fess_label_en.properties](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_label_en.properties) +* [fess_message_en.properties](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_message_en.properties) + +Para o analisador de busca/índice, se [doc.json](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_indices/fess/doc.json) contiver lang\_[lang] para o seu idioma, por favor, modifique o analisador para o seu idioma. Para mais detalhes sobre Analisadores, veja a [documentação do OpenSearch](https://opensearch.org/docs/latest/analyzers/search-analyzers/). + +Aceitamos pull requests para o seu idioma. + +## Desenvolvido por + +* [Lasta Di](https://github.com/lastaflute/lasta-di "Lasta Di"): Contêiner DI +* [LastaFlute](https://github.com/lastaflute/lastaflute "LastaFlute"): Framework Web +* [Lasta Job](https://github.com/lastaflute/lasta-job "Lasta Job"): Agendador de Tarefas +* [Fess Crawler](https://github.com/codelibs/fess-crawler "Fess Crawler"): Rastreador Web +* [OpenSearch](https://opensearch.org/ "OpenSearch"): Motor de Busca diff --git a/docs/zh-CN/README.md b/docs/zh-CN/README.md new file mode 100644 index 0000000000..34860f1d7a --- /dev/null +++ b/docs/zh-CN/README.md @@ -0,0 +1,158 @@ +# Fess: 企业搜索服务器 +[![Java CI with Maven](https://github.com/codelibs/fess/actions/workflows/maven.yml/badge.svg)](https://github.com/codelibs/fess/actions/workflows/maven.yml) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.codelibs.fess/fess/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.codelibs.fess/fess) +[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/gitbucket/gitbucket/blob/master/LICENSE) + +## 概述 + +Fess 是一个功能强大且易于部署的企业搜索服务器。您可以在任何可以运行 Java 运行时环境的平台上快速安装和运行 Fess。Fess 根据 [Apache 许可证 2.0](LICENSE) 提供。 + +Fess 基于 [OpenSearch](https://github.com/opensearch-project/OpenSearch)，但不需要 OpenSearch 的知识或经验。Fess 提供了一个易于使用的管理 GUI，您可以通过浏览器配置系统。Fess 还包含一个爬虫，能够抓取 [Web 服务器](https://fess.codelibs.org/14.17/admin/webconfig-guide.html)、[文件系统](https://fess.codelibs.org/14.17/admin/fileconfig-guide.html)或[数据存储](https://fess.codelibs.org/14.17/admin/dataconfig-guide.html)（如 CSV 或数据库）中的文档。Fess 支持多种文件格式，包括但不限于：Microsoft Office、PDF 和 zip。 + +*[Fess 网站搜索](https://github.com/codelibs/fess-site-search)* 是 [Google 网站搜索](https://enterprise.google.com/search/products/gss.html)的免费替代品。更多详情请参阅 [FSS JS 生成器文档](https://fss-generator.codelibs.org/docs/manual)。 + +## 官网 + +[fess.codelibs.org](https://fess.codelibs.org/) + +## 问题/疑问 + +[discuss.codelibs.org](https://discuss.codelibs.org/c/FessEN/) + +## 入门 + +您可以通过两种方式尝试 Fess。第一种是自行下载并安装，第二种是使用 [Docker](https://www.docker.com/products/docker-engine)。 + +### 下载并安装/运行 + +Fess 14.17 现已发布，可在 [发布页面](https://github.com/codelibs/fess/releases "download") 下载。提供三种下载形式：deb、rpm、zip。 + +以下命令展示了如何使用 zip 下载： + + $ unzip fess-14.17.x.zip + $ cd fess-14.17.x + $ ./bin/fess + +更多详情请参阅 [安装指南](https://fess.codelibs.org/14.17/install/index.html)。 + +### Docker + +我们在 [ghcr.io](https://github.com/orgs/codelibs/packages) 上提供了 Docker 镜像。我们还在[此存储库](https://github.com/codelibs/docker-fess/tree/master/compose)中提供了 Docker Compose (YAML) 文件。 + +### 浏览器 UI + +- 搜索 UI: http://localhost:8080/ + +![Search UI](https://fess.codelibs.org/_images/fess_search_result1.png) + +- 管理 UI: http://localhost:8080/admin/ （默认用户名/密码为 admin/admin） + +![Admin UI](https://fess.codelibs.org/_images/fess_admin_dashboard.png) + +您可以在管理 UI 的 (Web、文件、数据存储) 爬虫配置页面中注册爬取目标，然后在 [调度器页面](https://fess.codelibs.org/14.17/admin/scheduler-guide.html)手动启动爬虫。 + +## 从其他搜索提供商迁移 + +请参阅 [MIGRATION.md](MIGRATION.md)。 + +## 数据存储 + +当前，Fess 支持抓取以下[存储位置和 API](https://fess.codelibs.org/14.17/admin/dataconfig-guide.html)： + + - [Confluence/Jira](https://github.com/codelibs/fess-ds-atlassian) + - [Box](https://github.com/codelibs/fess-ds-box) + - [CSV](https://github.com/codelibs/fess-ds-csv) + - [Database](https://github.com/codelibs/fess-ds-db) + - [Dropbox](https://github.com/codelibs/fess-ds-dropbox) + - [Elasticsearch](https://github.com/codelibs/fess-ds-elasticsearch) + - [Git](https://github.com/codelibs/fess-ds-git) + - [Gitbucket](https://github.com/codelibs/fess-ds-gitbucket) + - [G Suite](https://github.com/codelibs/fess-ds-gsuite) + - [JSON](https://github.com/codelibs/fess-ds-json) + - [Office 365](https://github.com/codelibs/fess-ds-office365) + - [S3](https://github.com/codelibs/fess-ds-s3) + - [Salesforce](https://github.com/codelibs/fess-ds-salesforce) + - [SharePoint](https://github.com/codelibs/fess-ds-sharepoint) + - [Slack](https://github.com/codelibs/fess-ds-slack) + +## 主题 + + - [Simple](https://github.com/codelibs/fess-theme-simple) + - [Classic](https://github.com/codelibs/fess-theme-classic) + +## 数据处理 + + - [Logger](https://github.com/codelibs/fess-ingest-logger) + - [NDJSON](https://github.com/codelibs/fess-ingest-ndjson) + +## 脚本 + + - [Groovy](https://github.com/codelibs/fess-script-groovy) + - [OGNL](https://github.com/codelibs/fess-script-ognl) + +## 开发信息 + +### 获取源代码 + +1. 克隆 Fess 的存储库： + ``` + $ cd ~/workspace + $ git clone https://github.com/codelibs/fess.git + ``` + +2. 将克隆的存储库作为 [Maven](https://maven.apache.org/) 项目导入 [Eclipse](https://www.eclipse.org/eclipseide/) 或其他 IDE。 + +### 设置 OpenSearch 插件 + +运行 antrun:run 将插件下载到插件目录： + + $ mvn antrun:run + +### 运行 Fess + +在您的 IDE 上运行或调试 `org.codelibs.fess.FessBoot`，然后访问 http://localhost:8080/ + +### 构建包 + +运行 `package` 目标，然后在 target/releases 中创建发布文件。 + + $ mvn package + $ mvn rpm:rpm # .rpm 包 + $ mvn jdeb:jdeb # .deb 包 + +### 生成源代码 + + $ mvn dbflute:download # （仅运行一次） + $ mvn dbflute:freegen + $ mvn license:format + +### 集成测试 + +启动 Fess 服务器并运行以下命令： + + $ mvn test -P integrationTests -Dtest.fess.url="http://localhost:8080" -Dtest.search_engine.url="http://localhost:9201" + +要运行单个测试用例，您可以使用： + + $ mvn test -P integrationTests -Dtest.fess.url="http://localhost:8080" -Dtest.search_engine.url="http://localhost:9201" -Dtest=SearchApiTests + +### 翻译为您的语言 + +Fess 是国际化软件。 + +如果您想为您的语言添加标签/消息，请翻译属性文件，然后将其重命名为 fess\_\*\_[lang].properties。 + +* [fess_label_en.properties](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_label_en.properties) +* [fess_message_en.properties](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_message_en.properties) + +对于搜索/索引分析器，如果 [doc.json](https://github.com/codelibs/fess/blob/master/src/main/resources/fess_indices/fess/doc.json) 包含您语言的 lang\_[lang]，请为您的语言修改分析器。有关分析器的更多详细信息，请参阅 [OpenSearch 文档](https://opensearch.org/docs/latest/analyzers/search-analyzers/)。 + +我们欢迎您的语言的 Pull Request。 + +## 技术支持 + +* [Lasta Di](https://github.com/lastaflute/lasta-di "Lasta Di"): DI 容器 +* [LastaFlute](https://github.com/lastaflute/lastaflute "LastaFlute"): Web 框架 +* [Lasta Job](https://github.com/lastaflute/lasta-job "Lasta Job"): 任务调度器 +* [Fess Crawler](https://github.com/codelibs/fess-crawler "Fess Crawler"): Web 爬虫 +* [OpenSearch](https://opensearch.org/ "OpenSearch"): 搜索引擎