diff --git a/src/main/java/org/codelibs/fess/api/es/EsApiManager.java b/src/main/java/org/codelibs/fess/api/es/EsApiManager.java index 8c88451ce..8430d25c3 100644 --- a/src/main/java/org/codelibs/fess/api/es/EsApiManager.java +++ b/src/main/java/org/codelibs/fess/api/es/EsApiManager.java @@ -73,13 +73,13 @@ public class EsApiManager extends BaseApiManager { public void process(final HttpServletRequest request, final HttpServletResponse response, final FilterChain chain) throws IOException, ServletException { getSessionManager().getAttribute(Constants.ES_API_ACCESS_TOKEN, String.class).ifPresent(token -> { - String servletPath = request.getServletPath(); - String pathPrefix = ADMIN_SERVER + token; + final String servletPath = request.getServletPath(); + final String pathPrefix = ADMIN_SERVER + token; if (!servletPath.startsWith(pathPrefix)) { throw new WebApiException(HttpServletResponse.SC_FORBIDDEN, "Invalid access token."); } final String path; - String value = servletPath.substring(pathPrefix.length()); + final String value = servletPath.substring(pathPrefix.length()); if (!value.startsWith("/")) { path = "/" + value; } else { @@ -91,7 +91,7 @@ public class EsApiManager extends BaseApiManager { }); } - protected void processRequest(final HttpServletRequest request, final HttpServletResponse response, String path) { + protected void processRequest(final HttpServletRequest request, final HttpServletResponse response, final String path) { final Method httpMethod = Method.valueOf(request.getMethod().toUpperCase(Locale.ROOT)); final CurlRequest curlRequest = new CurlRequest(httpMethod, getUrl() + path); request.getParameterMap().entrySet().stream().forEach(entry -> { diff --git a/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java b/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java index 6f556b5ce..6c58796dd 100644 --- a/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java +++ b/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java @@ -406,9 +406,9 @@ public class JsonApiManager extends BaseApiManager { final String id = DocumentUtil.getValue(doc, fessConfig.getIndexFieldId(), String.class); searchService.update(id, builder -> { - Script script = new Script("ctx._source." + fessConfig.getIndexFieldFavoriteCount() + "+=1"); + final Script script = new Script("ctx._source." + fessConfig.getIndexFieldFavoriteCount() + "+=1"); builder.setScript(script); - Map upsertMap = new HashMap<>(); + final Map upsertMap = new HashMap<>(); upsertMap.put(fessConfig.getIndexFieldFavoriteCount(), 1); builder.setUpsert(upsertMap); builder.setRefresh(true); diff --git a/src/main/java/org/codelibs/fess/api/suggest/SuggestApiManager.java b/src/main/java/org/codelibs/fess/api/suggest/SuggestApiManager.java index d484ce3b8..e57b4bdeb 100644 --- a/src/main/java/org/codelibs/fess/api/suggest/SuggestApiManager.java +++ b/src/main/java/org/codelibs/fess/api/suggest/SuggestApiManager.java @@ -42,13 +42,14 @@ public class SuggestApiManager extends BaseApiManager { } @Override - public boolean matches(HttpServletRequest request) { + public boolean matches(final HttpServletRequest request) { final String servletPath = request.getServletPath(); return servletPath.startsWith(pathPrefix); } @Override - public void process(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException { + public void process(final HttpServletRequest request, final HttpServletResponse response, final FilterChain chain) throws IOException, + ServletException { int status = 0; String errMsg = StringUtil.EMPTY; final StringBuilder buf = new StringBuilder(255); 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 a53ea6def..f99797fdd 100644 --- a/src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java +++ b/src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java @@ -39,7 +39,7 @@ public class FavoriteLogService { @Resource protected FavoriteLogBhv favoriteLogBhv; - public boolean addUrl(String userCode, BiConsumer favoriteLogLambda) { + public boolean addUrl(final String userCode, final BiConsumer favoriteLogLambda) { return userInfoBhv.selectByPK(userCode).map(userInfo -> { final FavoriteLog favoriteLog = new FavoriteLog(); favoriteLogLambda.accept(userInfo, favoriteLog); 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 aa34f23e6..ba6f6c881 100644 --- a/src/main/java/org/codelibs/fess/app/service/GroupService.java +++ b/src/main/java/org/codelibs/fess/app/service/GroupService.java @@ -106,7 +106,7 @@ public class GroupService implements Serializable { } - public List getAvailableGroupList(Integer size) { + public List getAvailableGroupList(final Integer size) { return groupBhv.selectList(cb -> { cb.query().matchAll(); cb.paging(size, 1); 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 e44c39830..b635b1d81 100644 --- a/src/main/java/org/codelibs/fess/app/service/RoleService.java +++ b/src/main/java/org/codelibs/fess/app/service/RoleService.java @@ -110,7 +110,7 @@ public class RoleService implements Serializable { } - public List getAvailableRoleList(Integer size) { + public List getAvailableRoleList(final Integer size) { return roleBhv.selectList(cb -> { cb.query().matchAll(); cb.paging(size, 1); 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 5a2250d87..fed129de7 100644 --- a/src/main/java/org/codelibs/fess/app/service/SearchLogService.java +++ b/src/main/java/org/codelibs/fess/app/service/SearchLogService.java @@ -1,3 +1,18 @@ +/* + * Copyright 2012-2015 CodeLibs Project and 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.service; import javax.annotation.Resource; @@ -17,7 +32,7 @@ public class SearchLogService { @Resource private SystemHelper systemHelper; - public void deleteBefore(int days) { + public void deleteBefore(final int days) { searchLogBhv.selectCursor(cb -> { cb.query().setRequestedAt_LessEqual(systemHelper.getCurrentTimeAsLocalDateTime().minusDays(days)); }, entity -> { diff --git a/src/main/java/org/codelibs/fess/app/service/SearchService.java b/src/main/java/org/codelibs/fess/app/service/SearchService.java index 83d4c55a7..811bbbfef 100644 --- a/src/main/java/org/codelibs/fess/app/service/SearchService.java +++ b/src/main/java/org/codelibs/fess/app/service/SearchService.java @@ -173,7 +173,7 @@ public class SearchService { } data.setExecTime(execTime); - String queryId = QueryUtil.generateId(); + final String queryId = QueryUtil.generateId(); data.setPageSize(queryResponseList.getPageSize()); data.setCurrentPageNumber(queryResponseList.getCurrentPageNumber()); @@ -238,7 +238,7 @@ public class SearchService { final SearchLog searchLog = new SearchLog(); if (Constants.TRUE.equals(crawlerProperties.getProperty(Constants.USER_INFO_PROPERTY, Constants.TRUE))) { - String userCode = userInfoHelper.getUserCode(); + final String userCode = userInfoHelper.getUserCode(); if (userCode != null) { searchLog.setUserSessionId(userCode); } @@ -384,12 +384,12 @@ public class SearchService { return fessEsClient.update(fessConfig.getIndexDocumentIndex(), fessConfig.getIndexDocumentType(), id, field, value); } - public boolean update(final String id, Consumer builderLambda) { + public boolean update(final String id, final Consumer builderLambda) { try { - UpdateRequestBuilder builder = + final UpdateRequestBuilder builder = fessEsClient.prepareUpdate(fessConfig.getIndexDocumentIndex(), fessConfig.getIndexDocumentType(), id); builderLambda.accept(builder); - UpdateResponse response = builder.execute().actionGet(); + final UpdateResponse response = builder.execute().actionGet(); return response.isCreated(); } catch (final ElasticsearchException e) { throw new FessEsClientException("Failed to update doc " + id, e); 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 5ae42f414..7ac2a9b0e 100644 --- a/src/main/java/org/codelibs/fess/app/service/UserInfoService.java +++ b/src/main/java/org/codelibs/fess/app/service/UserInfoService.java @@ -1,3 +1,18 @@ +/* + * Copyright 2012-2015 CodeLibs Project and 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.service; import javax.annotation.Resource; @@ -13,7 +28,7 @@ public class UserInfoService { @Resource private SystemHelper systemHelper; - public void deleteBefore(int days) { + public void deleteBefore(final int days) { userInfoBhv.queryDelete(cb -> { cb.query().setUpdatedAt_LessEqual(systemHelper.getCurrentTimeAsLocalDateTime().minusDays(days)); }); 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 a3035b35c..61da4ffee 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 @@ -188,7 +188,7 @@ public class AdminBadwordAction extends FessAdminAction { verifyToken(() -> asDownloadHtml()); return asStream("badword.csv").stream(out -> { - Path tempFile = Files.createTempFile(null, null); + final Path tempFile = Files.createTempFile(null, null); try { try (Writer writer = new BufferedWriter(new OutputStreamWriter(Files.newOutputStream(tempFile), getCsvEncoding()))) { suggestBadWordService.exportCsv(writer); 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 4e83b2fd3..620a5f355 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 @@ -85,7 +85,7 @@ public class CreateForm implements Serializable { sortOrder = 0; createdBy = ComponentUtil.getSystemHelper().getUsername(); createdTime = ComponentUtil.getSystemHelper().getCurrentTimeAsLong(); - String roles = ComponentUtil.getFessConfig().getSearchDefaultRoles(); + final String roles = ComponentUtil.getFessConfig().getSearchDefaultRoles(); if (StringUtil.isNotBlank(roles)) { roleTypeIds = StreamUtil.of(roles.split(",")).map(role -> role.trim()).toArray(n -> new String[n]); } 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 0d0d07e93..d0d5a526e 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 @@ -184,7 +184,7 @@ public class AdminDesignAction extends FessAdminAction implements Serializable { @Execute public StreamResponse download(final FileAccessForm form) { - File file = getTargetFile(form.fileName).get(); + final File file = getTargetFile(form.fileName).get(); if (file == null) { throwValidationError(messages -> messages.addErrorsTargetFileDoesNotExist(GLOBAL, form.fileName), () -> asListHtml()); } 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 44b4d1205..d8f4e0604 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 @@ -196,7 +196,7 @@ public class AdminElevatewordAction extends FessAdminAction { verifyToken(() -> asDownloadHtml()); return asStream("elevate.csv").stream(out -> { - Path tempFile = Files.createTempFile(null, null); + final Path tempFile = Files.createTempFile(null, null); try { try (Writer writer = new BufferedWriter(new OutputStreamWriter(Files.newOutputStream(tempFile), getCsvEncoding()))) { suggestElevateWordService.exportCsv(writer); 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 772b04bc6..133ab141e 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 @@ -129,7 +129,7 @@ public class AdminFailureurlAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.DETAILS); validate(form, messages -> {}, () -> asDetailsHtml()); verifyToken(() -> asDetailsHtml()); - String id = form.id; + final String id = form.id; failureUrlService.getFailureUrl(id).alwaysPresent(entity -> { failureUrlService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); 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 39b812ae6..2392b16aa 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 @@ -121,7 +121,7 @@ public class CreateForm implements Serializable { sortOrder = 0; createdBy = ComponentUtil.getSystemHelper().getUsername(); createdTime = ComponentUtil.getSystemHelper().getCurrentTimeAsLong(); - String roles = ComponentUtil.getFessConfig().getSearchDefaultRoles(); + final String roles = ComponentUtil.getFessConfig().getSearchDefaultRoles(); if (StringUtil.isNotBlank(roles)) { roleTypeIds = StreamUtil.of(roles.split(",")).map(role -> role.trim()).toArray(n -> new String[n]); } 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 579207015..b1133a3bb 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 @@ -149,7 +149,7 @@ public class AdminGeneralAction extends FessAdminAction { form.esHttpUrl = crawlerProperties.getProperty(Constants.ELASTICSEARCH_WEB_URL_PROPERTY, Constants.ELASTICSEARCH_WEB_URL); } - private void updateProperty(String key, String value) { + private void updateProperty(final String key, final String value) { crawlerProperties.setProperty(key, value == null ? StringUtil.EMPTY : value); } 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 b49d1f63d..049a51fe2 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 @@ -136,7 +136,7 @@ public class AdminJoblogAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.DETAILS); validate(form, messages -> {}, () -> asDetailsHtml()); verifyToken(() -> asDetailsHtml()); - String id = form.id; + final String id = form.id; jobLogService.getJobLog(id).alwaysPresent(entity -> { jobLogService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); 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 efbf10414..131331cc4 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 @@ -76,7 +76,7 @@ public class CreateForm implements Serializable { sortOrder = 0; createdBy = ComponentUtil.getSystemHelper().getUsername(); createdTime = ComponentUtil.getSystemHelper().getCurrentTimeAsLong(); - String roles = ComponentUtil.getFessConfig().getSearchDefaultRoles(); + final String roles = ComponentUtil.getFessConfig().getSearchDefaultRoles(); if (StringUtil.isNotBlank(roles)) { roleTypeIds = StreamUtil.of(roles.split(",")).map(role -> role.trim()).toArray(n -> new String[n]); } 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 dfe2f22f7..58761e5ef 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 @@ -63,10 +63,10 @@ public class AdminLogAction extends FessAdminAction { @Execute public ActionResponse download(final String id) { - String filename = new String(Base64.getDecoder().decode(id), StandardCharsets.UTF_8).replace("..", "").replaceAll("\\s", ""); + final String filename = new String(Base64.getDecoder().decode(id), StandardCharsets.UTF_8).replace("..", "").replaceAll("\\s", ""); final String logFilePath = systemHelper.getLogFilePath(); if (StringUtil.isNotBlank(logFilePath)) { - Path path = Paths.get(logFilePath, filename); + final Path path = Paths.get(logFilePath, filename); return asStream(filename).contentType("text/plain; charset=UTF-8").stream(out -> { try (InputStream in = Files.newInputStream(path)) { out.write(in); @@ -83,21 +83,21 @@ public class AdminLogAction extends FessAdminAction { final List> logFileItems = new ArrayList>(); final String logFilePath = systemHelper.getLogFilePath(); if (StringUtil.isNotBlank(logFilePath)) { - Path logDirPath = Paths.get(logFilePath); + final Path logDirPath = Paths.get(logFilePath); try (Stream stream = Files.list(logDirPath)) { stream.filter(entry -> entry.getFileName().toString().endsWith(".log")).forEach(filePath -> { - Map map = new HashMap<>(); - String name = filePath.getFileName().toString(); + final Map map = new HashMap<>(); + final String name = filePath.getFileName().toString(); map.put("id", Base64.getEncoder().encodeToString(name.getBytes(StandardCharsets.UTF_8))); map.put("name", name); try { map.put("lastModified", new Date(Files.getLastModifiedTime(filePath).toMillis())); - } catch (IOException e) { + } catch (final IOException e) { throw new IORuntimeException(e); } logFileItems.add(map); }); - } catch (Exception e) { + } catch (final Exception e) { throw new FessSystemException("Failed to access log files.", 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 94a2f4cc2..518f0a44c 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 @@ -128,7 +128,7 @@ public class AdminSchedulerAction extends FessAdminAction { scheduledJobForm.name = ComponentUtil.getMessageManager().getMessage(LaRequestUtil.getRequest().getLocale(), "labels." + type + "_job_title", name); - String[] ids = new String[] { "", "", "" }; + final String[] ids = new String[] { "", "", "" }; if (Constants.WEB_CRAWLER_TYPE.equals(type)) { ids[0] = "\"" + id + "\""; } else if (Constants.FILE_CRAWLER_TYPE.equals(type)) { @@ -292,7 +292,7 @@ public class AdminSchedulerAction extends FessAdminAction { // =================================================================================== // Assist Logic // ============ - protected void loadScheduledJob(final EditForm form, ScheduledJob entity) { + protected void loadScheduledJob(final EditForm form, final ScheduledJob entity) { copyBeanToBean(entity, form, op -> op.exclude("crudMode").excludeNull()); form.jobLogging = entity.isLoggingEnabled() ? Constants.ON : null; form.crawler = entity.isCrawlerJob() ? Constants.ON : null; 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 0d62ab23f..e78011957 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 @@ -282,7 +282,7 @@ public class AdminUserAction extends FessAdminAction { } } - protected void verifyPassword(final CreateForm form, VaErrorHook validationErrorLambda) { + protected void verifyPassword(final CreateForm form, final VaErrorHook validationErrorLambda) { if (form.crudMode == CrudMode.CREATE && StringUtil.isBlank(form.password)) { resetPassword(form); throwValidationError(messages -> { 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 2efb0df20..4b88bdce9 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 @@ -129,7 +129,7 @@ public class CreateForm implements Serializable { sortOrder = 0; createdBy = ComponentUtil.getSystemHelper().getUsername(); createdTime = ComponentUtil.getSystemHelper().getCurrentTimeAsLong(); - String roles = ComponentUtil.getFessConfig().getSearchDefaultRoles(); + final String roles = ComponentUtil.getFessConfig().getSearchDefaultRoles(); if (StringUtil.isNotBlank(roles)) { roleTypeIds = StreamUtil.of(roles.split(",")).map(role -> role.trim()).toArray(n -> new String[n]); } 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 a3501a39b..1c3fbefcf 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 @@ -178,7 +178,7 @@ public class AdminWizardAction extends FessAdminAction { wConfig.setUpdatedTime(now); wConfig.setUrls(configPath); wConfig.setUserAgent(getDefaultString("default.config.web.userAgent", ComponentUtil.getUserAgentName())); - String roles = ComponentUtil.getFessConfig().getSearchDefaultRoles(); + final String roles = ComponentUtil.getFessConfig().getSearchDefaultRoles(); if (StringUtil.isNotBlank(roles)) { wConfig.setRoleTypeIds(StreamUtil.of(roles.split(",")).map(role -> role.trim()).toArray(n -> new String[n])); } @@ -209,7 +209,7 @@ public class AdminWizardAction extends FessAdminAction { fConfig.setUpdatedBy(username); fConfig.setUpdatedTime(now); fConfig.setPaths(configPath); - String roles = ComponentUtil.getFessConfig().getSearchDefaultRoles(); + final String roles = ComponentUtil.getFessConfig().getSearchDefaultRoles(); if (StringUtil.isNotBlank(roles)) { fConfig.setRoleTypeIds(StreamUtil.of(roles.split(",")).map(role -> role.trim()).toArray(n -> new String[n])); } 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 4c930f928..9e6368e17 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 @@ -102,7 +102,7 @@ public abstract class FessAdminAction extends FessBaseAction { public ActionResponse godHandPrologue(final ActionRuntime runtime) { try { return super.godHandPrologue(runtime); - } catch (UserRoleLoginException e) { + } catch (final UserRoleLoginException e) { return redirect(e.getActionClass()); } } 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 d6fbb9e74..eb4b199e6 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 @@ -59,7 +59,7 @@ public class LoginAction extends FessSearchAction { form.clearSecurityInfo(); try { return fessLoginAssist.loginRedirect(email, password, op -> {}, () -> getHtmlResponse()); - } catch (LoginFailureException lfe) { + } catch (final LoginFailureException lfe) { throwValidationError(messages -> messages.addErrorsLoginError(GLOBAL), () -> { return asHtml(path_Login_IndexJsp); }); 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 cd1d5a1b0..810e6dff9 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 @@ -372,7 +372,7 @@ public class SearchAction extends FessSearchAction { } @Override - public void setRequestedTime(long requestedTime) { + public void setRequestedTime(final long requestedTime) { data.register("requestedTime", requestedTime); super.setRequestedTime(requestedTime); } 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 76a090591..5f79c25f8 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java @@ -244,7 +244,7 @@ public abstract class AbstractFessFileTransformer extends AbstractFessXpathTrans // url putResultDataBody(dataMap, fessConfig.getIndexFieldUrl(), url); // created - Date now = systemHelper.getCurrentTime(); + final Date now = systemHelper.getCurrentTime(); putResultDataBody(dataMap, fessConfig.getIndexFieldCreated(), now); // TODO anchor putResultDataBody(dataMap, fessConfig.getIndexFieldAnchor(), StringUtil.EMPTY); @@ -257,7 +257,7 @@ public abstract class AbstractFessFileTransformer extends AbstractFessXpathTrans // contentLength putResultDataBody(dataMap, fessConfig.getIndexFieldContentLength(), Long.toString(responseData.getContentLength())); // lastModified - Date lastModified = responseData.getLastModified(); + final Date lastModified = responseData.getLastModified(); if (lastModified != null) { putResultDataBody(dataMap, fessConfig.getIndexFieldLastModified(), lastModified); // timestamp 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 be36c8564..9318f69c1 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java @@ -256,7 +256,7 @@ public class FessXpathTransformer extends AbstractFessXpathTransformer { // url putResultDataBody(dataMap, fessConfig.getIndexFieldUrl(), url); // created - Date now = systemHelper.getCurrentTime(); + final Date now = systemHelper.getCurrentTime(); putResultDataBody(dataMap, fessConfig.getIndexFieldCreated(), now); // anchor putResultDataBody(dataMap, fessConfig.getIndexFieldAnchor(), getAnchorList(document, responseData)); @@ -270,7 +270,7 @@ public class FessXpathTransformer extends AbstractFessXpathTransformer { // contentLength putResultDataBody(dataMap, fessConfig.getIndexFieldContentLength(), Long.toString(responseData.getContentLength())); // lastModified - Date lastModified = responseData.getLastModified(); + final Date lastModified = responseData.getLastModified(); if (lastModified != null) { putResultDataBody(dataMap, fessConfig.getIndexFieldLastModified(), lastModified); // timestamp diff --git a/src/main/java/org/codelibs/fess/entity/QueryContext.java b/src/main/java/org/codelibs/fess/entity/QueryContext.java index dd2f1a315..c2bed9f21 100644 --- a/src/main/java/org/codelibs/fess/entity/QueryContext.java +++ b/src/main/java/org/codelibs/fess/entity/QueryContext.java @@ -64,7 +64,7 @@ public class QueryContext { } public void addFunctionScore(final Consumer functionScoreQuery) { - FunctionScoreQueryBuilder builder = QueryBuilders.functionScoreQuery(queryBuilder); + final FunctionScoreQueryBuilder builder = QueryBuilders.functionScoreQuery(queryBuilder); functionScoreQuery.accept(builder); queryBuilder = builder; } @@ -104,7 +104,7 @@ public class QueryContext { return queryBuilder; } - public void addFieldLog(String field, String text) { + public void addFieldLog(final String field, final String text) { if (fieldLogMap == null) { return; } @@ -124,7 +124,7 @@ public class QueryContext { return Collections.emptyList(); } - public void addHighlightedQuery(String text) { + public void addHighlightedQuery(final String text) { if (highlightedQuerySet != null) { highlightedQuerySet.add(text); } diff --git a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java index f5029f5b6..df091013e 100644 --- a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java +++ b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java @@ -227,7 +227,7 @@ public class FessEsClient implements Client { public void addTransportAddress(final String host, final int port) { try { transportAddressList.add(new InetSocketTransportAddress(InetAddress.getByName(host), port)); - } catch (UnknownHostException e) { + } catch (final UnknownHostException e) { throw new FessSystemException("Failed to resolve the hostname: " + host, e); } } @@ -399,12 +399,12 @@ public class FessEsClient implements Client { if (ResourceUtil.isExist(dataPath)) { try { final BulkRequestBuilder builder = client.prepareBulk(); - ObjectMapper mapper = new ObjectMapper(); + final ObjectMapper mapper = new ObjectMapper(); Arrays.stream(FileUtil.readUTF8(dataPath).split("\n")).reduce( (prev, line) -> { try { if (StringUtil.isBlank(prev)) { - Map> result = + final Map> result = mapper.readValue(line, new TypeReference>>() { }); if (result.keySet().contains("index")) { @@ -415,7 +415,7 @@ public class FessEsClient implements Client { return StringUtil.EMPTY; } } else { - Map> result = + final Map> result = mapper.readValue(prev, new TypeReference>>() { }); if (result.keySet().contains("index")) { @@ -425,7 +425,7 @@ public class FessEsClient implements Client { builder.add(requestBuilder); } } - } catch (Exception e) { + } catch (final Exception e) { logger.warn("Failed to parse " + dataPath.toString()); } return StringUtil.EMPTY; @@ -567,13 +567,13 @@ public class FessEsClient implements Client { final FessConfig fessConfig = ComponentUtil.getFessConfig(); final Map source = hit.getSource(); if (source != null) { - Map docMap = new HashMap<>(source); + final Map docMap = new HashMap<>(source); docMap.put(fessConfig.getIndexFieldId(), hit.getId()); return docMap; } final Map fields = hit.getFields(); if (fields != null) { - Map docMap = + final Map docMap = fields.entrySet().stream() .collect(Collectors.toMap(e -> e.getKey(), e -> (Object) e.getValue().getValues())); docMap.put(fessConfig.getIndexFieldId(), hit.getId()); @@ -607,13 +607,13 @@ public class FessEsClient implements Client { final FessConfig fessConfig = ComponentUtil.getFessConfig(); final Map source = response.getSource(); if (source != null) { - Map docMap = new HashMap<>(source); + final Map docMap = new HashMap<>(source); docMap.put(fessConfig.getIndexFieldId(), response.getId()); return docMap; } final Map fields = response.getFields(); if (fields != null) { - Map docMap = + final Map docMap = fields.entrySet().stream() .collect(Collectors.toMap(e -> e.getKey(), e -> (Object) e.getValue().getValues())); docMap.put(fessConfig.getIndexFieldId(), response.getId()); @@ -643,13 +643,13 @@ public class FessEsClient implements Client { final FessConfig fessConfig = ComponentUtil.getFessConfig(); final Map source = hit.getSource(); if (source != null) { - Map docMap = new HashMap<>(source); + final Map docMap = new HashMap<>(source); docMap.put(fessConfig.getIndexFieldId(), hit.getId()); return docMap; } final Map fields = hit.getFields(); if (fields != null) { - Map docMap = + final Map docMap = fields.entrySet().stream() .collect(Collectors.toMap(e -> e.getKey(), e -> (Object) e.getValue().getValues())); docMap.put(fessConfig.getIndexFieldId(), hit.getId()); @@ -745,20 +745,20 @@ public class FessEsClient implements Client { final FessConfig fessConfig = ComponentUtil.getFessConfig(); final BulkRequestBuilder bulkRequestBuilder = client.prepareBulk(); for (final Map doc : docList) { - Object id = doc.remove(fessConfig.getIndexFieldId()); + final Object id = doc.remove(fessConfig.getIndexFieldId()); bulkRequestBuilder.add(client.prepareIndex(index, type, id.toString()).setSource(doc)); } final BulkResponse response = bulkRequestBuilder.execute().actionGet(); if (response.hasFailures()) { if (logger.isDebugEnabled()) { - List requests = bulkRequestBuilder.request().requests(); - BulkItemResponse[] items = response.getItems(); + final List requests = bulkRequestBuilder.request().requests(); + final BulkItemResponse[] items = response.getItems(); if (requests.size() == items.length) { for (int i = 0; i < requests.size(); i++) { - BulkItemResponse resp = items[i]; + final BulkItemResponse resp = items[i]; if (resp.isFailed() && resp.getFailure() != null) { - ActionRequest req = requests.get(i); - Failure failure = resp.getFailure(); + final ActionRequest req = requests.get(i); + final Failure failure = resp.getFailure(); logger.debug("Failed Request: " + req + "\n=>" + failure.getMessage()); } } @@ -791,7 +791,7 @@ public class FessEsClient implements Client { return this; } - public SearchConditionBuilder administrativeAccess(boolean administrativeAccess) { + public SearchConditionBuilder administrativeAccess(final boolean administrativeAccess) { this.administrativeAccess = administrativeAccess; return this; } @@ -1309,29 +1309,29 @@ public class FessEsClient implements Client { @Override public > ActionFuture execute( - Action action, Request request) { + final Action action, final Request request) { return client.execute(action, request); } @Override public > void execute( - Action action, Request request, ActionListener listener) { + final Action action, final Request request, final ActionListener listener) { client.execute(action, request, listener); } @Override public > RequestBuilder prepareExecute( - Action action) { + final Action action) { return client.prepareExecute(action); } @Override - public ActionFuture termVectors(TermVectorsRequest request) { + public ActionFuture termVectors(final TermVectorsRequest request) { return client.termVectors(request); } @Override - public void termVectors(TermVectorsRequest request, ActionListener listener) { + public void termVectors(final TermVectorsRequest request, final ActionListener listener) { client.termVectors(request, listener); } @@ -1341,19 +1341,19 @@ public class FessEsClient implements Client { } @Override - public TermVectorsRequestBuilder prepareTermVectors(String index, String type, String id) { + public TermVectorsRequestBuilder prepareTermVectors(final String index, final String type, final String id) { return client.prepareTermVectors(index, type, id); } @Override @Deprecated - public ActionFuture termVector(TermVectorsRequest request) { + public ActionFuture termVector(final TermVectorsRequest request) { return client.termVector(request); } @Override @Deprecated - public void termVector(TermVectorsRequest request, ActionListener listener) { + public void termVector(final TermVectorsRequest request, final ActionListener listener) { client.termVector(request, listener); } @@ -1365,17 +1365,17 @@ public class FessEsClient implements Client { @Override @Deprecated - public TermVectorsRequestBuilder prepareTermVector(String index, String type, String id) { + public TermVectorsRequestBuilder prepareTermVector(final String index, final String type, final String id) { return client.prepareTermVector(index, type, id); } @Override - public ActionFuture multiTermVectors(MultiTermVectorsRequest request) { + public ActionFuture multiTermVectors(final MultiTermVectorsRequest request) { return client.multiTermVectors(request); } @Override - public void multiTermVectors(MultiTermVectorsRequest request, ActionListener listener) { + public void multiTermVectors(final MultiTermVectorsRequest request, final ActionListener listener) { client.multiTermVectors(request, listener); } @@ -1389,11 +1389,11 @@ public class FessEsClient implements Client { return client.headers(); } - public void setSizeForDelete(int sizeForDelete) { + public void setSizeForDelete(final int sizeForDelete) { this.sizeForDelete = sizeForDelete; } - public void setScrollForDelete(String scrollForDelete) { + public void setScrollForDelete(final String scrollForDelete) { this.scrollForDelete = scrollForDelete; } 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 fa7106b90..b569c7aa2 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 @@ -396,13 +396,13 @@ public class DataConfig extends BsDataConfig implements CrawlingConfig { @Override public Integer getTimeToLive() { - String value = getHandlerParameterMap().get("timeToLive"); + final String value = getHandlerParameterMap().get("timeToLive"); if (StringUtil.isBlank(value)) { return null; } try { return Integer.parseInt(value); - } catch (NumberFormatException e) { + } catch (final NumberFormatException e) { if (logger.isDebugEnabled()) { logger.debug("Invalid format: " + value, e); } 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 1b60bec88..0a4745292 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 @@ -33,8 +33,6 @@ public class SearchLog extends BsSearchLog { private static final long serialVersionUID = 1L; - private List clickLogList; - private List searchFieldLogList; private OptionalEntity userInfo; @@ -56,7 +54,6 @@ public class SearchLog extends BsSearchLog { } public void setClickLogList(final List clickLogList) { - this.clickLogList = clickLogList; } @@ -101,7 +98,7 @@ public class SearchLog extends BsSearchLog { } @Override - public void setUserInfoId(String value) { + public void setUserInfoId(final String value) { userInfo = null; super.setUserInfoId(value); } 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 b46a5472e..206143532 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 @@ -36,7 +36,7 @@ public class Group extends BsGroup { return asDocMeta().id(); } - public void setId(String id) { + public void setId(final String id) { asDocMeta().id(id); } 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 1c3998187..1cf0db1ea 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 @@ -36,7 +36,7 @@ public class Role extends BsRole { return asDocMeta().id(); } - public void setId(String id) { + public void setId(final String id) { asDocMeta().id(id); } } 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 eafd96291..48f88e9ef 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 @@ -40,7 +40,7 @@ public class User extends BsUser { return asDocMeta().id(); } - public void setId(String id) { + public void setId(final String id) { asDocMeta().id(id); } diff --git a/src/main/java/org/codelibs/fess/exception/UserRoleLoginException.java b/src/main/java/org/codelibs/fess/exception/UserRoleLoginException.java index a3e1a1617..b2aa5626a 100644 --- a/src/main/java/org/codelibs/fess/exception/UserRoleLoginException.java +++ b/src/main/java/org/codelibs/fess/exception/UserRoleLoginException.java @@ -21,9 +21,9 @@ public class UserRoleLoginException extends RuntimeException { private static final long serialVersionUID = 1L; - private Class actionClass; + private final Class actionClass; - public UserRoleLoginException(Class actionClass) { + public UserRoleLoginException(final Class actionClass) { this.actionClass = actionClass; } diff --git a/src/main/java/org/codelibs/fess/exec/Crawler.java b/src/main/java/org/codelibs/fess/exec/Crawler.java index 66ef8ff91..625bed87d 100644 --- a/src/main/java/org/codelibs/fess/exec/Crawler.java +++ b/src/main/java/org/codelibs/fess/exec/Crawler.java @@ -320,7 +320,7 @@ public class Crawler implements Serializable { final CrawlingSessionHelper crawlingSessionHelper = ComponentUtil.getCrawlingSessionHelper(); boolean completed = false; - int exitCode = Constants.EXIT_OK; + final int exitCode = Constants.EXIT_OK; try { writeTimeToSessionInfo(crawlingSessionHelper, Constants.CRAWLER_START_TIME); diff --git a/src/main/java/org/codelibs/fess/exec/SuggestCreator.java b/src/main/java/org/codelibs/fess/exec/SuggestCreator.java index 77fa13952..61a7ece07 100644 --- a/src/main/java/org/codelibs/fess/exec/SuggestCreator.java +++ b/src/main/java/org/codelibs/fess/exec/SuggestCreator.java @@ -134,17 +134,17 @@ public class SuggestCreator implements Serializable { try { latch.await(); - } catch (InterruptedException ignore) {} + } catch (final InterruptedException ignore) {} return result.get(); } - private int purge(LocalDateTime time) { + private int purge(final LocalDateTime time) { final SuggestHelper suggestHelper = ComponentUtil.getSuggestHelper(); try { suggestHelper.purge(time); return 0; - } catch (Exception e) { + } catch (final Exception e) { logger.info("Purge error.", e); return 1; } diff --git a/src/main/java/org/codelibs/fess/helper/CrawlingSessionHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlingSessionHelper.java index 7536c8b83..85274069e 100644 --- a/src/main/java/org/codelibs/fess/helper/CrawlingSessionHelper.java +++ b/src/main/java/org/codelibs/fess/helper/CrawlingSessionHelper.java @@ -126,8 +126,8 @@ public class CrawlingSessionHelper implements Serializable { } - public Date getDocumentExpires(CrawlingConfig config) { - Integer timeToLive = config.getTimeToLive(); + public Date getDocumentExpires(final CrawlingConfig config) { + final Integer timeToLive = config.getTimeToLive(); if (timeToLive != null) { // timeToLive minutes final long now = ComponentUtil.getSystemHelper().getCurrentTimeAsLong(); diff --git a/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java b/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java index 6f2790129..255e08354 100644 --- a/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java +++ b/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java @@ -62,7 +62,7 @@ public class KeyMatchHelper { .stream() .forEach( keyMatch -> { - BoolQueryBuilder boolQuery = QueryBuilders.boolQuery(); + final BoolQueryBuilder boolQuery = QueryBuilders.boolQuery(); getDocumentList(keyMatch).stream().map(doc -> { return DocumentUtil.getValue(doc, fessConfig.getIndexFieldDocId(), String.class); }).forEach(docId -> { @@ -108,16 +108,16 @@ public class KeyMatchHelper { this.reloadInterval = reloadInterval; } - public void buildQuery(List keywordList, FunctionScoreQueryBuilder functionScoreQuery) { + public void buildQuery(final List keywordList, final FunctionScoreQueryBuilder functionScoreQuery) { keywordList.stream().forEach(keyword -> { - Pair pair = keyMatchQueryMap.get(toLowerCase(keyword)); + final Pair pair = keyMatchQueryMap.get(toLowerCase(keyword)); if (pair != null) { functionScoreQuery.add(pair.getFirst(), pair.getSecond()); } }); } - private String toLowerCase(String term) { + private String toLowerCase(final String term) { return term != null ? term.toLowerCase(Locale.ROOT) : term; } diff --git a/src/main/java/org/codelibs/fess/helper/QueryHelper.java b/src/main/java/org/codelibs/fess/helper/QueryHelper.java index e74a6631b..e127ccd7a 100644 --- a/src/main/java/org/codelibs/fess/helper/QueryHelper.java +++ b/src/main/java/org/codelibs/fess/helper/QueryHelper.java @@ -246,7 +246,7 @@ public class QueryHelper implements Serializable { final Set roleSet = roleQueryHelper.build(); if (!roleSet.isEmpty()) { queryContext.addQuery(boolQuery -> { - BoolQueryBuilder roleQuery = QueryBuilders.boolQuery(); + final BoolQueryBuilder roleQuery = QueryBuilders.boolQuery(); roleSet.stream().forEach(name -> { roleQuery.should(QueryBuilders.termQuery(fessConfig.getIndexFieldRole(), name)); }); diff --git a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java index 07808b5d5..b1eaa19ec 100644 --- a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java @@ -121,7 +121,7 @@ public class SearchLogHelper { userInfoBhv.insertOrUpdate(userInfo); }).start(); }).orElse(() -> { - UserInfo userInfo = new UserInfo(); + final UserInfo userInfo = new UserInfo(); userInfo.setId(userCode); userInfo.setCreatedAt(now); userInfo.setUpdatedAt(now); @@ -247,14 +247,14 @@ public class SearchLogHelper { new String[] { fessConfig.getIndexFieldDocId() }) .forEach( doc -> { - String id = DocumentUtil.getValue(doc, fessConfig.getIndexFieldDocId(), String.class); - String docId = DocumentUtil.getValue(doc, fessConfig.getIndexFieldDocId(), String.class); + final String id = DocumentUtil.getValue(doc, fessConfig.getIndexFieldDocId(), String.class); + final String docId = DocumentUtil.getValue(doc, fessConfig.getIndexFieldDocId(), String.class); if (id != null && docId != null && clickCountMap.containsKey(docId)) { - Integer count = clickCountMap.get(docId); - Script script = + final Integer count = clickCountMap.get(docId); + final Script script = new Script("ctx._source." + fessConfig.getIndexFieldClickCount() + "+=" + count.toString()); - Map upsertMap = new HashMap<>(); + final Map upsertMap = new HashMap<>(); upsertMap.put(fessConfig.getIndexFieldClickCount(), 1); builder.add(new UpdateRequest(fessConfig.getIndexDocumentIndex(), fessConfig .getIndexDocumentType(), id).script(script).upsert(upsertMap)); diff --git a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java index 246d45ba6..a85576377 100644 --- a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java @@ -132,14 +132,14 @@ public class SuggestHelper { while (!initialized.get()) { try { Thread.sleep(100); - } catch (Exception e) { + } catch (final Exception e) { error.accept(e); return; } } final FessConfig fessConfig = ComponentUtil.getFessConfig(); - DocumentReader reader = + final DocumentReader reader = new ESSourceReader(fessEsClient, suggester.settings(), fessConfig.getIndexDocumentIndex(), fessConfig.getIndexDocumentType()); @@ -152,8 +152,8 @@ public class SuggestHelper { }).error(t -> error.accept(t)); } - public void purge(LocalDateTime time) { - BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); + public void purge(final LocalDateTime time) { + final BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); boolQueryBuilder.must(QueryBuilders.rangeQuery(FieldNames.TIMESTAMP).lt(time.format(DateTimeFormatter.BASIC_ISO_DATE))); boolQueryBuilder.must(QueryBuilders.termQuery(FieldNames.KINDS, SuggestItem.Kind.DOCUMENT.toString())); diff --git a/src/main/java/org/codelibs/fess/helper/ViewHelper.java b/src/main/java/org/codelibs/fess/helper/ViewHelper.java index d4ab1d955..d682f98dc 100644 --- a/src/main/java/org/codelibs/fess/helper/ViewHelper.java +++ b/src/main/java/org/codelibs/fess/helper/ViewHelper.java @@ -161,7 +161,7 @@ public class ViewHelper implements Serializable { final Set queries = new HashSet<>(); LaRequestUtil.getOptionalRequest().ifPresent(request -> { @SuppressWarnings("unchecked") - Set set = (Set) request.getAttribute(Constants.HIGHLIGHT_QUERIES); + final Set set = (Set) request.getAttribute(Constants.HIGHLIGHT_QUERIES); if (set != null) { queries.addAll(set); } diff --git a/src/main/java/org/codelibs/fess/helper/impl/RoleQueryHelperImpl.java b/src/main/java/org/codelibs/fess/helper/impl/RoleQueryHelperImpl.java index 10091a408..1c9ba4658 100644 --- a/src/main/java/org/codelibs/fess/helper/impl/RoleQueryHelperImpl.java +++ b/src/main/java/org/codelibs/fess/helper/impl/RoleQueryHelperImpl.java @@ -76,7 +76,7 @@ public class RoleQueryHelperImpl implements RoleQueryHelper, Serializable { protected Map cookieNameMap; - private List defaultRoleList = new ArrayList<>(); + private final List defaultRoleList = new ArrayList<>(); @PostConstruct public void init() { @@ -119,7 +119,7 @@ public class RoleQueryHelperImpl implements RoleQueryHelper, Serializable { fessUserBean -> StreamUtil.of(fessUserBean.getRoles()).map(role -> Base64.getDecoder().decode(role)).map(role -> { try { return Optional.of(new String(role, Constants.UTF_8)); - } catch (IOException e) { + } catch (final IOException e) { return null; } }).forEach(role -> role.ifPresent(roleList::add))); diff --git a/src/main/java/org/codelibs/fess/job/PurgeLogJob.java b/src/main/java/org/codelibs/fess/job/PurgeLogJob.java index f27059684..66431bc2a 100644 --- a/src/main/java/org/codelibs/fess/job/PurgeLogJob.java +++ b/src/main/java/org/codelibs/fess/job/PurgeLogJob.java @@ -36,7 +36,7 @@ public class PurgeLogJob { final JobLogService jobLogService = ComponentUtil.getComponent(JobLogService.class); final UserInfoService userInfoService = ComponentUtil.getComponent(UserInfoService.class); final DynamicProperties crawlerProperties = ComponentUtil.getCrawlerProperties(); - SystemHelper systemHelper = ComponentUtil.getSystemHelper(); + final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); final StringBuilder resultBuf = new StringBuilder(); 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 4ee2f7c3d..f461726c7 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessFwAssistantDirector.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessFwAssistantDirector.java @@ -130,7 +130,8 @@ public class FessFwAssistantDirector extends CachedFwAssistantDirector { direction.directApiCall(createApiFailureHook()); direction.directMultipart(() -> new FessMultipartRequestHandler()); direction.directHtmlRendering(new JspHtmlRenderingProvider() { - protected String getShowErrorsForwardPath(ActionRuntime runtime) { + @Override + protected String getShowErrorsForwardPath(final ActionRuntime runtime) { if (FessAdminAction.class.isAssignableFrom(runtime.getActionType())) { return "/admin/error/error.jsp"; } else {