diff --git a/src/main/java/org/codelibs/fess/api/WebApiManagerFactory.java b/src/main/java/org/codelibs/fess/api/WebApiManagerFactory.java index adcd33723..daa6edb10 100644 --- a/src/main/java/org/codelibs/fess/api/WebApiManagerFactory.java +++ b/src/main/java/org/codelibs/fess/api/WebApiManagerFactory.java @@ -25,7 +25,7 @@ public class WebApiManagerFactory { protected WebApiManager[] webApiManagers = new WebApiManager[0]; public void add(final WebApiManager webApiManager) { - final List list = new ArrayList(); + final List list = new ArrayList<>(); for (final WebApiManager manager : webApiManagers) { list.add(manager); } diff --git a/src/main/java/org/codelibs/fess/api/gsa/GsaApiManager.java b/src/main/java/org/codelibs/fess/api/gsa/GsaApiManager.java index 52c7d3c22..1f0a342df 100644 --- a/src/main/java/org/codelibs/fess/api/gsa/GsaApiManager.java +++ b/src/main/java/org/codelibs/fess/api/gsa/GsaApiManager.java @@ -106,9 +106,9 @@ public class GsaApiManager extends BaseApiManager implements WebApiManager { final long allRecordCount = data.getAllRecordCount(); final List> documentItems = data.getDocumentItems(); - final List getFields = new ArrayList(); + final List getFields = new ArrayList<>(); // meta tags should be returned - final String getFieldsParam = (String) request.getParameter("getfields"); + final String getFieldsParam = request.getParameter("getfields"); if (StringUtil.isNotBlank(getFieldsParam)) { getFields.addAll(Arrays.asList(getFieldsParam.split("\\."))); } @@ -116,7 +116,7 @@ public class GsaApiManager extends BaseApiManager implements WebApiManager { if ("xml".equals(request.getParameter("output"))) { xmlDtd = true; } - StringBuilder requestUri = new StringBuilder(request.getRequestURI()); + final StringBuilder requestUri = new StringBuilder(request.getRequestURI()); if (request.getQueryString() != null) { requestUri.append("?").append(request.getQueryString()); } @@ -190,7 +190,7 @@ public class GsaApiManager extends BaseApiManager implements WebApiManager { buf.append(""); } long recordNumber = startNumber; - for (Map document : documentItems) { + for (final Map document : documentItems) { buf.append(""); @@ -198,7 +198,7 @@ public class GsaApiManager extends BaseApiManager implements WebApiManager { document.put("UE", url); document.put("U", URLDecoder.decode(url, Constants.UTF_8)); document.put("T", document.remove("title")); - float score = Float.parseFloat((String) document.remove("boost")); + final float score = Float.parseFloat((String) document.remove("boost")); document.put("RK", (int) (score * 10)); document.put("S", ((String) document.remove("content_description")).replaceAll("<(/*)em>", "<$1b>")); document.put("LANG", document.remove("lang")); @@ -240,7 +240,7 @@ public class GsaApiManager extends BaseApiManager implements WebApiManager { } else { charset = (String) document.remove("contentType_s"); if (StringUtil.isNotBlank(charset)) { - Matcher m = Pattern.compile(".*;\\s*charset=(.+)").matcher(charset); + final Matcher m = Pattern.compile(".*;\\s*charset=(.+)").matcher(charset); if (m.matches()) { charset = m.group(1); buf.append(charset); @@ -327,7 +327,7 @@ public class GsaApiManager extends BaseApiManager implements WebApiManager { static class WrappedWebApiRequest extends WebApiRequest { private Map parameters; - private Map extraParameters; + private final Map extraParameters; public WrappedWebApiRequest(final HttpServletRequest request, final String servletPath, final Map extraParams) { super(request, servletPath); @@ -336,7 +336,7 @@ public class GsaApiManager extends BaseApiManager implements WebApiManager { @Override public String getParameter(final String name) { - String[] values = getParameterMap().get(name); + final String[] values = getParameterMap().get(name); if (values != null) { return values[0]; } @@ -346,7 +346,7 @@ public class GsaApiManager extends BaseApiManager implements WebApiManager { @Override public Map getParameterMap() { if (parameters == null) { - parameters = new HashMap(); + parameters = new HashMap<>(); parameters.putAll(super.getParameterMap()); // Parameter of the same key will be overwritten parameters.putAll(extraParameters); @@ -410,11 +410,11 @@ public class GsaApiManager extends BaseApiManager implements WebApiManager { @Override public Map getFields() { - Map fields = new HashMap<>(); - for (Map.Entry entry : request.getParameterMap().entrySet()) { - String key = entry.getKey(); + final Map fields = new HashMap<>(); + for (final Map.Entry entry : request.getParameterMap().entrySet()) { + final String key = entry.getKey(); if (key.startsWith("fields.")) { - String[] value = simplifyArray(entry.getValue()); + final String[] value = simplifyArray(entry.getValue()); fields.put(key.substring("fields.".length()), value); } } @@ -510,7 +510,7 @@ public class GsaApiManager extends BaseApiManager implements WebApiManager { } @Override - public Object getAttribute(String name) { + public Object getAttribute(final String name) { return request.getAttribute(name); } 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 28a5c54d7..886257a6d 100644 --- a/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java +++ b/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java @@ -699,11 +699,11 @@ public class JsonApiManager extends BaseApiManager { @Override public Map getFields() { - Map fields = new HashMap<>(); - for (Map.Entry entry : request.getParameterMap().entrySet()) { - String key = entry.getKey(); + final Map fields = new HashMap<>(); + for (final Map.Entry entry : request.getParameterMap().entrySet()) { + final String key = entry.getKey(); if (key.startsWith("fields.")) { - String[] value = simplifyArray(entry.getValue()); + final String[] value = simplifyArray(entry.getValue()); fields.put(key.substring("fields.".length()), value); } } @@ -777,7 +777,7 @@ public class JsonApiManager extends BaseApiManager { } @Override - public Object getAttribute(String name) { + public Object getAttribute(final String name) { return request.getAttribute(name); } 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 3429e59fe..3fa124ecf 100644 --- a/src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java +++ b/src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java @@ -88,7 +88,7 @@ public class AllJobScheduler implements LaJobScheduler { } try { jobHelper.register(scheduledJob); - } catch (Exception e) { + } catch (final Exception e) { logger.warn("Failed to update schdule " + scheduledJob, e); } }); @@ -103,7 +103,7 @@ public class AllJobScheduler implements LaJobScheduler { }); } - public void setJobClass(Class jobClass) { + public void setJobClass(final Class jobClass) { this.jobClass = jobClass; } } 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 24663886f..86f4d0439 100644 --- a/src/main/java/org/codelibs/fess/app/service/BadWordService.java +++ b/src/main/java/org/codelibs/fess/app/service/BadWordService.java @@ -163,7 +163,7 @@ public class BadWordService implements Serializable { }, new EntityRowHandler() { @Override public void handle(final BadWord entity) { - final List list = new ArrayList(); + final List list = new ArrayList<>(); addToList(list, entity.getSuggestWord()); try { csvWriter.writeValues(list); 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 49c0b08de..79fcc2b0c 100644 --- a/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java +++ b/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java @@ -287,7 +287,7 @@ public class CrawlingInfoService implements Serializable { @SuppressWarnings("resource") final CsvWriter csvWriter = new CsvWriter(writer, cfg); try { - final List list = new ArrayList(); + final List list = new ArrayList<>(); list.add("SessionId"); list.add("SessionCreatedTime"); list.add("Key"); @@ -300,7 +300,7 @@ public class CrawlingInfoService implements Serializable { }, new EntityRowHandler() { @Override public void handle(final CrawlingInfoParam entity) { - final List list = new ArrayList(); + final List list = new ArrayList<>(); entity.getCrawlingInfo().ifPresent(crawlingInfo -> { addToList(list, crawlingInfo.getSessionId()); addToList(list, crawlingInfo.getCreatedTime()); 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 fa1b7ec1d..902546b31 100644 --- a/src/main/java/org/codelibs/fess/app/service/DataConfigService.java +++ b/src/main/java/org/codelibs/fess/app/service/DataConfigService.java @@ -111,7 +111,7 @@ public class DataConfigService implements Serializable { fctltmCb.fetchFirst(fessConfig.getPageLabeltypeMaxFetchSizeAsInteger()); }); if (!fctltmList.isEmpty()) { - final List labelTypeIds = new ArrayList(fctltmList.size()); + final List labelTypeIds = new ArrayList<>(fctltmList.size()); for (final DataConfigToLabel mapping : fctltmList) { labelTypeIds.add(mapping.getLabelTypeId()); } @@ -133,7 +133,7 @@ public class DataConfigService implements Serializable { if (isNew) { // Insert if (labelTypeIds != null) { - final List fctltmList = new ArrayList(); + final List fctltmList = new ArrayList<>(); for (final String labelTypeId : labelTypeIds) { final DataConfigToLabel mapping = new DataConfigToLabel(); mapping.setDataConfigId(dataConfigId); @@ -151,8 +151,8 @@ public class DataConfigService implements Serializable { fctltmCb.query().setDataConfigId_Equal(dataConfigId); fctltmCb.fetchFirst(fessConfig.getPageLabeltypeMaxFetchSizeAsInteger()); }); - final List newList = new ArrayList(); - final List matchedList = new ArrayList(); + final List newList = new ArrayList<>(); + final List matchedList = new ArrayList<>(); for (final String id : labelTypeIds) { boolean exist = false; for (final DataConfigToLabel mapping : fctltmList) { 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 d3796b719..ef8d749b3 100644 --- a/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java +++ b/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java @@ -84,7 +84,7 @@ public class ElevateWordService implements Serializable { wctltmCb.fetchFirst(fessConfig.getPageLabeltypeMaxFetchSizeAsInteger()); }); if (!wctltmList.isEmpty()) { - final List labelTypeIds = new ArrayList(wctltmList.size()); + final List labelTypeIds = new ArrayList<>(wctltmList.size()); for (final ElevateWordToLabel mapping : wctltmList) { labelTypeIds.add(mapping.getLabelTypeId()); } @@ -105,7 +105,7 @@ public class ElevateWordService implements Serializable { if (isNew) { // Insert if (labelTypeIds != null) { - final List wctltmList = new ArrayList(); + final List wctltmList = new ArrayList<>(); for (final String id : labelTypeIds) { final ElevateWordToLabel mapping = new ElevateWordToLabel(); mapping.setElevateWordId(elevateWordId); @@ -123,8 +123,8 @@ public class ElevateWordService implements Serializable { wctltmCb.query().setElevateWordId_Equal(elevateWordId); wctltmCb.fetchFirst(fessConfig.getPageLabeltypeMaxFetchSizeAsInteger()); }); - final List newList = new ArrayList(); - final List matchedList = new ArrayList(); + final List newList = new ArrayList<>(); + final List matchedList = new ArrayList<>(); for (final String id : labelTypeIds) { boolean exist = false; for (final ElevateWordToLabel mapping : list) { @@ -236,7 +236,7 @@ public class ElevateWordService implements Serializable { @SuppressWarnings("resource") final CsvWriter csvWriter = new CsvWriter(writer, cfg); try { - final List list = new ArrayList(); + final List list = new ArrayList<>(); list.add("SuggestWord"); list.add("Reading"); list.add("Role"); @@ -249,7 +249,7 @@ public class ElevateWordService implements Serializable { }, new EntityRowHandler() { @Override public void handle(final ElevateWord entity) { - final List list = new ArrayList(); + final List list = new ArrayList<>(); addToList(list, entity.getSuggestWord()); addToList(list, entity.getReading()); addToList(list, entity.getTargetRole()); 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 629ee426d..a83d0c9b7 100644 --- a/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java +++ b/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java @@ -129,7 +129,7 @@ public class FailureUrlService implements Serializable { } public List getExcludedUrlList(final String configId) { - int failureCount = fessConfig.getFailureCountThreshold(); + final int failureCount = fessConfig.getFailureCountThreshold(); final String ignoreFailureType = fessConfig.getIgnoreFailureType(); if (failureCount < 0) { @@ -150,7 +150,7 @@ public class FailureUrlService implements Serializable { if (StringUtil.isNotBlank(ignoreFailureType)) { pattern = Pattern.compile(ignoreFailureType); } - final List urlList = new ArrayList(); + final List urlList = new ArrayList<>(); for (final FailureUrl failureUrl : list) { if (pattern != null) { if (!pattern.matcher(failureUrl.getUrl()).matches()) { 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 18926795e..7a5e4ddae 100644 --- a/src/main/java/org/codelibs/fess/app/service/FileConfigService.java +++ b/src/main/java/org/codelibs/fess/app/service/FileConfigService.java @@ -117,7 +117,7 @@ public class FileConfigService implements Serializable { fctltmCb.fetchFirst(fessConfig.getPageLabeltypeMaxFetchSizeAsInteger()); }); if (!fctltmList.isEmpty()) { - final List labelTypeIds = new ArrayList(fctltmList.size()); + final List labelTypeIds = new ArrayList<>(fctltmList.size()); for (final FileConfigToLabel mapping : fctltmList) { labelTypeIds.add(mapping.getLabelTypeId()); } @@ -138,7 +138,7 @@ public class FileConfigService implements Serializable { if (isNew) { // Insert if (labelTypeIds != null) { - final List fctltmList = new ArrayList(); + final List fctltmList = new ArrayList<>(); for (final String labelTypeId : labelTypeIds) { final FileConfigToLabel mapping = new FileConfigToLabel(); mapping.setFileConfigId(fileConfigId); @@ -156,8 +156,8 @@ public class FileConfigService implements Serializable { fctltmCb.query().setFileConfigId_Equal(fileConfigId); fctltmCb.fetchFirst(fessConfig.getPageLabeltypeMaxFetchSizeAsInteger()); }); - final List newList = new ArrayList(); - final List matchedList = new ArrayList(); + final List newList = new ArrayList<>(); + final List matchedList = new ArrayList<>(); for (final String id : labelTypeIds) { boolean exist = false; for (final FileConfigToLabel mapping : fctltmList) { 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 f1fa1a01c..c6feb5a5c 100644 --- a/src/main/java/org/codelibs/fess/app/service/WebConfigService.java +++ b/src/main/java/org/codelibs/fess/app/service/WebConfigService.java @@ -126,7 +126,7 @@ public class WebConfigService implements Serializable { wctltmCb.fetchFirst(fessConfig.getPageLabeltypeMaxFetchSizeAsInteger()); }); if (!wctltmList.isEmpty()) { - final List labelTypeIds = new ArrayList(wctltmList.size()); + final List labelTypeIds = new ArrayList<>(wctltmList.size()); for (final WebConfigToLabel mapping : wctltmList) { labelTypeIds.add(mapping.getLabelTypeId()); } @@ -147,7 +147,7 @@ public class WebConfigService implements Serializable { if (isNew) { // Insert if (labelTypeIds != null) { - final List wctltmList = new ArrayList(); + final List wctltmList = new ArrayList<>(); for (final String id : labelTypeIds) { final WebConfigToLabel mapping = new WebConfigToLabel(); mapping.setWebConfigId(webConfigId); @@ -165,8 +165,8 @@ public class WebConfigService implements Serializable { wctltmCb.query().setWebConfigId_Equal(webConfigId); wctltmCb.fetchFirst(fessConfig.getPageLabeltypeMaxFetchSizeAsInteger()); }); - final List newList = new ArrayList(); - final List matchedList = new ArrayList(); + final List newList = new ArrayList<>(); + final List matchedList = new ArrayList<>(); for (final String id : labelTypeIds) { boolean exist = false; for (final WebConfigToLabel mapping : list) { 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 5d9151c93..27013ce54 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 @@ -225,7 +225,7 @@ public class AdminBadwordAction extends FessAdminAction { badWordService.store(entity); suggestHelper.addBadWord(entity.getSuggestWord()); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -246,7 +246,7 @@ public class AdminBadwordAction extends FessAdminAction { badWordService.store(entity); suggestHelper.storeAllBadWords(); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -270,7 +270,7 @@ public class AdminBadwordAction extends FessAdminAction { badWordService.delete(entity); suggestHelper.deleteBadWord(entity.getSuggestWord()); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError( messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), () -> 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 3e6ebd87f..77a642dc2 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 @@ -167,7 +167,7 @@ public class AdminBoostdocAction extends FessAdminAction { try { boostDocumentRuleService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -187,7 +187,7 @@ public class AdminBoostdocAction extends FessAdminAction { try { boostDocumentRuleService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -210,7 +210,7 @@ public class AdminBoostdocAction extends FessAdminAction { try { boostDocumentRuleService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError( messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), () -> 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 ce9a1d535..f16834e0f 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 @@ -211,7 +211,7 @@ public class AdminDataconfigAction extends FessAdminAction { try { dataConfigService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -231,7 +231,7 @@ public class AdminDataconfigAction extends FessAdminAction { try { dataConfigService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -254,7 +254,7 @@ public class AdminDataconfigAction extends FessAdminAction { try { dataConfigService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError( messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); @@ -313,9 +313,9 @@ public class AdminDataconfigAction extends FessAdminAction { protected void registerHandlerNames(final RenderData data) { final List dataStoreNameList = dataStoreFactory.getDataStoreNameList(); - final List> itemList = new ArrayList>(); + final List> itemList = new ArrayList<>(); for (final String name : dataStoreNameList) { - final Map map = new HashMap(); + final Map map = new HashMap<>(); map.put(Constants.ITEM_LABEL, name); map.put(Constants.ITEM_VALUE, name); itemList.add(map); 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 678da31fb..0feb6be65 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 @@ -86,7 +86,7 @@ public class AdminDesignAction extends FessAdminAction implements Serializable { private List loadFileNameItems() { final File baseDir = new File(getServletContext().getRealPath("/")); - final List fileNameItems = new ArrayList(); + final List fileNameItems = new ArrayList<>(); final List fileList = getAccessibleFileList(baseDir); final int length = baseDir.getAbsolutePath().length(); for (final File file : fileList) { @@ -281,7 +281,7 @@ public class AdminDesignAction extends FessAdminAction implements Serializable { } private List getAccessibleFileList(final File baseDir) { - final List fileList = new ArrayList(); + final List fileList = new ArrayList<>(); fileList.addAll(FileUtils.listFiles(new File(baseDir, "images"), fessConfig.getSupportedUploadedMediaExtentionsAsArray(), true)); fileList.addAll(FileUtils.listFiles(new File(baseDir, "css"), fessConfig.getSupportedUploadedCssExtentionsAsArray(), true)); fileList.addAll(FileUtils.listFiles(new File(baseDir, "js"), fessConfig.getSupportedUploadedJsExtentionsAsArray(), true)); 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 01abc1375..cb5112f2b 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 @@ -26,5 +26,5 @@ public class ListForm implements Serializable { private static final long serialVersionUID = 1L; - public Map searchParams = new HashMap(); + public Map searchParams = new HashMap<>(); } 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 ead5a4d04..10b814df8 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 @@ -275,7 +275,7 @@ public class AdminDictKuromojiAction extends FessAdminAction { try { kuromojiService.store(form.dictId, entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -295,7 +295,7 @@ public class AdminDictKuromojiAction extends FessAdminAction { try { kuromojiService.store(form.dictId, entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -317,7 +317,7 @@ public class AdminDictKuromojiAction extends FessAdminAction { try { kuromojiService.delete(form.dictId, entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError( messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); 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 8cbafdf67..c9445a45c 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 @@ -279,7 +279,7 @@ public class AdminDictSynonymAction extends FessAdminAction { try { synonymService.store(form.dictId, entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -299,7 +299,7 @@ public class AdminDictSynonymAction extends FessAdminAction { try { synonymService.store(form.dictId, entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -321,7 +321,7 @@ public class AdminDictSynonymAction extends FessAdminAction { try { synonymService.delete(form.dictId, entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError( messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), () -> 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 72ff175ad..5d08deef0 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 @@ -168,7 +168,7 @@ public class AdminDuplicatehostAction extends FessAdminAction { try { duplicateHostService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -188,7 +188,7 @@ public class AdminDuplicatehostAction extends FessAdminAction { try { duplicateHostService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -211,7 +211,7 @@ public class AdminDuplicatehostAction extends FessAdminAction { try { duplicateHostService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError( messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), () -> 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 5d07f3872..ccd20d9a4 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 @@ -233,7 +233,7 @@ public class AdminElevatewordAction extends FessAdminAction { suggestHelper.addElevateWord(entity.getSuggestWord(), entity.getReading(), entity.getLabelTypeValues(), entity.getTargetRole(), entity.getBoost()); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -255,7 +255,7 @@ public class AdminElevatewordAction extends FessAdminAction { suggestHelper.deleteAllElevateWord(); suggestHelper.storeAllElevateWords(); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -279,7 +279,7 @@ public class AdminElevatewordAction extends FessAdminAction { elevateWordService.delete(entity); suggestHelper.deleteElevateWord(entity.getSuggestWord()); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError( messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), () -> 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 c60eebb83..b1ac82934 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 @@ -185,7 +185,7 @@ public class AdminFileauthAction extends FessAdminAction { try { fileAuthenticationService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -205,7 +205,7 @@ public class AdminFileauthAction extends FessAdminAction { try { fileAuthenticationService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -228,7 +228,7 @@ public class AdminFileauthAction extends FessAdminAction { try { fileAuthenticationService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError( messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); @@ -273,7 +273,7 @@ public class AdminFileauthAction extends FessAdminAction { } protected void registerProtocolSchemeItems(final RenderData data) { - final List> itemList = new ArrayList>(); + final List> itemList = new ArrayList<>(); final Locale locale = LaRequestUtil.getRequest().getLocale(); itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.file_auth_scheme_samba"), Constants.SAMBA)); itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.file_auth_scheme_ftp"), Constants.FTP)); @@ -281,7 +281,7 @@ public class AdminFileauthAction extends FessAdminAction { } protected void registerFileConfigItems(final RenderData data) { - final List> itemList = new ArrayList>(); + final List> itemList = new ArrayList<>(); final List fileConfigList = fileConfigService.getAllFileConfigList(false, false, false, null); for (final FileConfig fileConfig : fileConfigList) { itemList.add(createItem(fileConfig.getName(), fileConfig.getId().toString())); @@ -290,7 +290,7 @@ public class AdminFileauthAction extends FessAdminAction { } protected Map createItem(final String label, final String value) { - final Map map = new HashMap(2); + final Map map = new HashMap<>(2); map.put(Constants.ITEM_LABEL, label); map.put(Constants.ITEM_VALUE, value); return map; 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 2d6cfe7a7..88f8488f0 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 @@ -208,7 +208,7 @@ public class AdminFileconfigAction extends FessAdminAction { try { fileConfigService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -228,7 +228,7 @@ public class AdminFileconfigAction extends FessAdminAction { try { fileConfigService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -251,7 +251,7 @@ public class AdminFileconfigAction extends FessAdminAction { try { fileConfigService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError( messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); 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 79a45eca7..5ad918509 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 @@ -82,7 +82,7 @@ public class AdminGeneralAction extends FessAdminAction { }); final String[] toAddresses = form.notificationTo.split(","); - final Map dataMap = new HashMap(); + final Map dataMap = new HashMap<>(); dataMap.put("hostname", systemHelper.getHostname()); final FessConfig fessConfig = ComponentUtil.getFessConfig(); @@ -188,7 +188,7 @@ public class AdminGeneralAction extends FessAdminAction { } private List getDayItems() { - final List items = new ArrayList(); + final List items = new ArrayList<>(); for (int i = 0; i < 32; i++) { items.add(Integer.toString(i)); } 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 4d8c11410..c6431a78c 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 @@ -170,7 +170,7 @@ public class AdminKeymatchAction extends FessAdminAction { keyMatchService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); ComponentUtil.getKeyMatchHelper().update(); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -191,7 +191,7 @@ public class AdminKeymatchAction extends FessAdminAction { keyMatchService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); ComponentUtil.getKeyMatchHelper().update(); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -215,7 +215,7 @@ public class AdminKeymatchAction extends FessAdminAction { keyMatchService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); ComponentUtil.getKeyMatchHelper().update(); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError( messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), () -> 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 155e75851..78d48723d 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 @@ -206,7 +206,7 @@ public class AdminLabeltypeAction extends FessAdminAction { try { labelTypeService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -226,7 +226,7 @@ public class AdminLabeltypeAction extends FessAdminAction { try { labelTypeService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -249,7 +249,7 @@ public class AdminLabeltypeAction extends FessAdminAction { try { labelTypeService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError( messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); 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 33c6ac6c6..0763bdabf 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 @@ -75,7 +75,7 @@ public class AdminLogAction extends FessAdminAction { } private List> getLogFileItems() { - final List> logFileItems = new ArrayList>(); + final List> logFileItems = new ArrayList<>(); final String logFilePath = systemHelper.getLogFilePath(); if (StringUtil.isNotBlank(logFilePath)) { final Path logDirPath = Paths.get(logFilePath); 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 787af2ca0..654630acb 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 @@ -169,7 +169,7 @@ public class AdminPathmapAction extends FessAdminAction { try { pathMappingService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -189,7 +189,7 @@ public class AdminPathmapAction extends FessAdminAction { try { pathMappingService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -212,7 +212,7 @@ public class AdminPathmapAction extends FessAdminAction { try { pathMappingService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError( messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), () -> 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 9d78fc3bc..c01fe06e3 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 @@ -185,7 +185,7 @@ public class AdminReqheaderAction extends FessAdminAction { try { requestHeaderService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -205,7 +205,7 @@ public class AdminReqheaderAction extends FessAdminAction { try { requestHeaderService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -228,7 +228,7 @@ public class AdminReqheaderAction extends FessAdminAction { try { requestHeaderService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError( messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); @@ -273,7 +273,7 @@ public class AdminReqheaderAction extends FessAdminAction { } protected void registerProtocolSchemeItems(final RenderData data) { - final List> itemList = new ArrayList>(); + final List> itemList = new ArrayList<>(); final Locale locale = LaRequestUtil.getRequest().getLocale(); itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.webauth_scheme_basic"), Constants.BASIC)); itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.webauth_scheme_digest"), Constants.DIGEST)); @@ -282,7 +282,7 @@ public class AdminReqheaderAction extends FessAdminAction { } protected void registerWebConfigItems(final RenderData data) { - final List> itemList = new ArrayList>(); + final List> itemList = new ArrayList<>(); final List webConfigList = webConfigService.getAllWebConfigList(false, false, false, null); for (final WebConfig webConfig : webConfigList) { itemList.add(createItem(webConfig.getName(), webConfig.getId().toString())); @@ -291,7 +291,7 @@ public class AdminReqheaderAction extends FessAdminAction { } protected Map createItem(final String label, final String value) { - final Map map = new HashMap(2); + final Map map = new HashMap<>(2); map.put(Constants.ITEM_LABEL, label); map.put(Constants.ITEM_VALUE, value); return map; 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 24af17f95..f54548b4e 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 @@ -205,7 +205,7 @@ public class AdminSchedulerAction extends FessAdminAction { try { scheduledJobService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -225,7 +225,7 @@ public class AdminSchedulerAction extends FessAdminAction { try { scheduledJobService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -248,7 +248,7 @@ public class AdminSchedulerAction extends FessAdminAction { try { scheduledJobService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError( messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); 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 21819cdb7..5545cfeb1 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 @@ -133,7 +133,7 @@ public class ListForm implements SearchRequestParams, Serializable { } @Override - public Object getAttribute(String name) { + public Object getAttribute(final String name) { return LaRequestUtil.getRequest().getAttribute(name); } 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 783a68209..394682bfb 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 @@ -74,7 +74,7 @@ public class AdminSysteminfoAction extends FessAdminAction { // ============ protected void registerEnvItems(final RenderData data) { - final List> itemList = new ArrayList>(); + final List> itemList = new ArrayList<>(); for (final Map.Entry entry : System.getenv().entrySet()) { itemList.add(createItem(entry.getKey(), entry.getValue())); } @@ -82,7 +82,7 @@ public class AdminSysteminfoAction extends FessAdminAction { } protected void registerPropItems(final RenderData data) { - final List> itemList = new ArrayList>(); + final List> itemList = new ArrayList<>(); for (final Map.Entry entry : System.getProperties().entrySet()) { itemList.add(createItem(entry.getKey(), entry.getValue())); } @@ -90,7 +90,7 @@ public class AdminSysteminfoAction extends FessAdminAction { } protected void registerFessPropItems(final RenderData data) { - final List> itemList = new ArrayList>(); + final List> itemList = new ArrayList<>(); for (final Map.Entry entry : systemProperties.entrySet()) { itemList.add(createItem(entry.getKey(), entry.getValue())); } @@ -98,7 +98,7 @@ public class AdminSysteminfoAction extends FessAdminAction { } protected void registerBugReportItems(final RenderData data) { - final List> itemList = new ArrayList>(); + final List> itemList = new ArrayList<>(); for (final String label : bugReportLabels) { itemList.add(createPropItem(label)); } @@ -124,7 +124,7 @@ public class AdminSysteminfoAction extends FessAdminAction { } protected Map createItem(final Object label, final Object value) { - final Map map = new HashMap(2); + final Map map = new HashMap<>(2); map.put(Constants.ITEM_LABEL, label != null ? label.toString() : StringUtil.EMPTY); map.put(Constants.ITEM_VALUE, value != null ? value.toString() : StringUtil.EMPTY); return map; 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 d496d01c3..63eb74844 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 @@ -126,7 +126,7 @@ public class AdminUpgradeAction extends FessAdminAction { private void upgradeFrom10_0() { - IndicesAdminClient indicesClient = fessEsClient.admin().indices(); + final IndicesAdminClient indicesClient = fessEsClient.admin().indices(); final String configIndex = ".fess_config"; try { @@ -243,18 +243,19 @@ public class AdminUpgradeAction extends FessAdminAction { }); saveInfo(messages -> messages.addSuccessUpgradeFrom(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, "10.0", e.getLocalizedMessage())); } } - private void addFieldMapping(IndicesAdminClient indicesClient, final String index, final String type, final String field, + private void addFieldMapping(final IndicesAdminClient indicesClient, final String index, final String type, final String field, final String source) { - GetFieldMappingsResponse gfmResponse = + final GetFieldMappingsResponse gfmResponse = indicesClient.prepareGetFieldMappings(index).addTypes(type).setFields(field).execute().actionGet(); if (gfmResponse.fieldMappings(index, type, field).isNull()) { - PutMappingResponse pmResponse = indicesClient.preparePutMapping(index).setType(type).setSource(source).execute().actionGet(); + final PutMappingResponse pmResponse = + indicesClient.preparePutMapping(index).setType(type).setSource(source).execute().actionGet(); if (!pmResponse.isAcknowledged()) { logger.warn("Failed to add " + field + " to " + index + "/" + type); } 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 700af9cd0..a48c3313d 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 @@ -287,7 +287,7 @@ public class AdminUserAction extends FessAdminAction { } protected Map createItem(final String label, final String value) { - final Map map = new HashMap(2); + final Map map = new HashMap<>(2); map.put(Constants.ITEM_LABEL, label); map.put(Constants.ITEM_VALUE, value); return map; 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 e7c6b8f3e..f82a0de90 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 @@ -183,7 +183,7 @@ public class AdminWebauthAction extends FessAdminAction { try { webAuthenticationService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -203,7 +203,7 @@ public class AdminWebauthAction extends FessAdminAction { try { webAuthenticationService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -226,7 +226,7 @@ public class AdminWebauthAction extends FessAdminAction { try { webAuthenticationService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError( messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); @@ -271,7 +271,7 @@ public class AdminWebauthAction extends FessAdminAction { } protected void registerProtocolSchemeItems(final RenderData data) { - final List> itemList = new ArrayList>(); + final List> itemList = new ArrayList<>(); final Locale locale = LaRequestUtil.getRequest().getLocale(); itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.webauth_scheme_basic"), Constants.BASIC)); itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.webauth_scheme_digest"), Constants.DIGEST)); @@ -280,7 +280,7 @@ public class AdminWebauthAction extends FessAdminAction { } protected void registerWebConfigItems(final RenderData data) { - final List> itemList = new ArrayList>(); + final List> itemList = new ArrayList<>(); final List webConfigList = webConfigService.getAllWebConfigList(false, false, false, null); for (final WebConfig webConfig : webConfigList) { itemList.add(createItem(webConfig.getName(), webConfig.getId().toString())); @@ -289,7 +289,7 @@ public class AdminWebauthAction extends FessAdminAction { } protected Map createItem(final String label, final String value) { - final Map map = new HashMap(2); + final Map map = new HashMap<>(2); map.put(Constants.ITEM_LABEL, label); map.put(Constants.ITEM_VALUE, value); return map; 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 903e4d25f..eb97ec9a9 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 @@ -208,7 +208,7 @@ public class AdminWebconfigAction extends FessAdminAction { try { webConfigService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -228,7 +228,7 @@ public class AdminWebconfigAction extends FessAdminAction { try { webConfigService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); } @@ -251,7 +251,7 @@ public class AdminWebconfigAction extends FessAdminAction { try { webConfigService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - } catch (Exception e) { + } catch (final Exception e) { throwValidationError( messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), () -> asEditHtml()); 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 fb2304407..0ce58ee72 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 @@ -66,8 +66,8 @@ public abstract class FessAdminAction extends FessBaseAction { return LaServletContextUtil.getServletContext(); } - protected String buildThrowableMessage(Throwable t) { - StringBuilder buf = new StringBuilder(100); + protected String buildThrowableMessage(final Throwable t) { + final StringBuilder buf = new StringBuilder(100); Throwable current = t; while (current != null) { buf.append(current.getLocalizedMessage()).append(' '); 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 1a8218462..4c50a3d30 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 @@ -145,7 +145,7 @@ public abstract class FessSearchAction extends FessBaseAction { } } - final Map labelMap = new LinkedHashMap(); + final Map labelMap = new LinkedHashMap<>(); if (!labelTypeItems.isEmpty()) { for (final Map map : labelTypeItems) { labelMap.put(map.get(Constants.ITEM_VALUE), map.get(Constants.ITEM_LABEL)); @@ -155,7 +155,7 @@ public abstract class FessSearchAction extends FessBaseAction { // sort if (StringUtil.isBlank(form.sort)) { - String[] defaultSortValues = fessConfig.getDefaultSortValues(getUserBean()); + final String[] defaultSortValues = fessConfig.getDefaultSortValues(getUserBean()); if (defaultSortValues.length > 0) { form.sort = String.join(",", defaultSortValues); } 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 dbfcb8ae4..e0a6805b8 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 @@ -107,7 +107,7 @@ public class SearchForm implements SearchRequestParams, Serializable { @Override public GeoInfo getGeoInfo() { - GeoInfo geoInfo = createGeoInfo(LaRequestUtil.getRequest()); + final GeoInfo geoInfo = createGeoInfo(LaRequestUtil.getRequest()); if (geoInfo != null) { return geoInfo; } @@ -130,7 +130,7 @@ public class SearchForm implements SearchRequestParams, Serializable { } @Override - public Object getAttribute(String name) { + public Object getAttribute(final String name) { return LaRequestUtil.getRequest().getAttribute(name); } 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 b7d5c9f02..d9e486012 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 @@ -79,7 +79,7 @@ public class CacheAction extends FessSearchAction { return redirect(ErrorAction.class); } - StreamResponse response = + final StreamResponse response = asStream(DocumentUtil.getValue(doc, fessConfig.getIndexFieldDocId(), String.class)).contentType("text/html; charset=UTF-8") .data(content.getBytes(Constants.CHARSET_UTF_8)); response.headerContentDispositionInline(); // TODO will be fixed in lastaflute 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 8e878feb5..85fdf8b52 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 @@ -40,7 +40,7 @@ public class LogoutAction extends FessSearchAction { @Execute public HtmlResponse index() { - final String username = getUserBean().map(u -> u.getUserId()).orElse("-"); + getUserBean().map(u -> u.getUserId()).orElse("-"); activityHelper.logout(getUserBean()); fessLoginAssist.logout(); return redirect(LoginAction.class); diff --git a/src/main/java/org/codelibs/fess/app/web/search/SearchAction.java b/src/main/java/org/codelibs/fess/app/web/search/SearchAction.java index f6288a3a6..3333f7c4c 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 @@ -177,7 +177,7 @@ public class SearchAction extends FessSearchAction { buf.append(form.q); if (!form.fields.isEmpty() && form.fields.containsKey(LABEL_FIELD)) { final String[] values = form.fields.get(LABEL_FIELD); - final List labelList = new ArrayList(); + final List labelList = new ArrayList<>(); if (values != null) { for (final String v : values) { labelList.add(v); @@ -206,7 +206,7 @@ public class SearchAction extends FessSearchAction { pagingQueryList.add("sort=" + LaFunctions.u(form.sort)); } if (form.lang != null) { - final Set langSet = new HashSet(); + final Set langSet = new HashSet<>(); for (final String lang : form.lang) { if (StringUtil.isNotBlank(lang) && lang.length() < 1000) { if (Constants.ALL_LANGUAGES.equals(lang)) { diff --git a/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java b/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java index 3b01039f5..9117cfdf8 100644 --- a/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java +++ b/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java @@ -71,9 +71,9 @@ public class FessCrawlerThread extends CrawlerThread { ResponseData responseData = null; try { final CrawlingConfig crawlingConfig = crawlingConfigHelper.get(crawlerContext.getSessionId()); - final Map dataMap = new HashMap(); + final Map dataMap = new HashMap<>(); dataMap.put(fessConfig.getIndexFieldUrl(), url); - final List roleTypeList = new ArrayList(); + final List roleTypeList = new ArrayList<>(); StreamUtil.of(crawlingConfig.getPermissions()).forEach(p -> roleTypeList.add(p)); if (url.startsWith("smb://")) { if (url.endsWith("/")) { @@ -184,7 +184,7 @@ public class FessCrawlerThread extends CrawlerThread { try { storeChildUrls(childUrlSet.stream().filter(rd -> StringUtil.isNotBlank(rd.getUrl())).collect(Collectors.toSet()), urlQueue.getUrl(), urlQueue.getDepth() != null ? urlQueue.getDepth() + 1 : 1); - } catch (Throwable t) { + } catch (final Throwable t) { if (!ComponentUtil.available()) { throw new ContainerNotAvailableException(t); } @@ -197,7 +197,7 @@ public class FessCrawlerThread extends CrawlerThread { protected Set getAnchorSet(final Object obj) { List anchorList; if (obj instanceof String) { - anchorList = new ArrayList(); + anchorList = new ArrayList<>(); anchorList.add(obj.toString()); } else if (obj instanceof List) { anchorList = (List) obj; 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 6fa4e5d17..5cf3649cf 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java @@ -98,13 +98,13 @@ public abstract class AbstractFessFileTransformer extends AbstractTransformer im protected Map generateData(final ResponseData responseData) { final Extractor extractor = getExtractor(responseData); - final Map params = new HashMap(); + final Map params = new HashMap<>(); params.put(TikaMetadataKeys.RESOURCE_NAME_KEY, getResourceName(responseData)); final String mimeType = responseData.getMimeType(); params.put(HttpHeaders.CONTENT_TYPE, mimeType); params.put(HttpHeaders.CONTENT_ENCODING, responseData.getCharSet()); final UnsafeStringBuilder contentMetaBuf = new UnsafeStringBuilder(1000); - final Map dataMap = new HashMap(); + final Map dataMap = new HashMap<>(); final Map metaDataMap = new HashMap<>(); String content; try (final InputStream in = responseData.getResponseBody()) { @@ -286,7 +286,7 @@ public abstract class AbstractFessFileTransformer extends AbstractTransformer im // boost putResultDataBody(dataMap, fessConfig.getIndexFieldBoost(), crawlingConfig.getDocumentBoost()); // label: labelType - final Set labelTypeSet = new HashSet(); + final Set labelTypeSet = new HashSet<>(); for (final String labelType : crawlingConfig.getLabelTypeValues()) { labelTypeSet.add(labelType); } @@ -485,7 +485,7 @@ public abstract class AbstractFessFileTransformer extends AbstractTransformer im public void addMetaContentMapping(final String metaname, final String dynamicField) { if (metaContentMapping == null) { - metaContentMapping = new HashMap(); + metaContentMapping = new HashMap<>(); } metaContentMapping.put(metaname, dynamicField); } 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 58e430e3d..9d2aeaaa0 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java @@ -115,7 +115,7 @@ public class FessXpathTransformer extends XpathTransformer implements FessTransf final Document document = parser.getDocument(); - final Map dataMap = new LinkedHashMap(); + final Map dataMap = new LinkedHashMap<>(); for (final Map.Entry entry : fieldRuleMap.entrySet()) { final String path = entry.getValue(); try { @@ -278,7 +278,7 @@ public class FessXpathTransformer extends XpathTransformer implements FessTransf // boost putResultDataBody(dataMap, fessConfig.getIndexFieldBoost(), crawlingConfig.getDocumentBoost()); // label: labelType - final Set labelTypeSet = new HashSet(); + final Set labelTypeSet = new HashSet<>(); for (final String labelType : crawlingConfig.getLabelTypeValues()) { labelTypeSet.add(labelType); } @@ -286,7 +286,7 @@ public class FessXpathTransformer extends XpathTransformer implements FessTransf labelTypeSet.addAll(labelTypeHelper.getMatchedLabelValueSet(url)); putResultDataBody(dataMap, fessConfig.getIndexFieldLabel(), labelTypeSet); // role: roleType - final List roleTypeList = new ArrayList(); + final List roleTypeList = new ArrayList<>(); StreamUtil.of(crawlingConfig.getPermissions()).forEach(p -> roleTypeList.add(p)); putResultDataBody(dataMap, fessConfig.getIndexFieldRole(), roleTypeList); // id @@ -315,7 +315,7 @@ public class FessXpathTransformer extends XpathTransformer implements FessTransf } protected String getLangXpath(final FessConfig fessConfig, final Map xpathConfigMap) { - String xpath = xpathConfigMap.get("default.lang"); + final String xpath = xpathConfigMap.get("default.lang"); if (StringUtil.isNotBlank(xpath)) { return xpath; } @@ -323,7 +323,7 @@ public class FessXpathTransformer extends XpathTransformer implements FessTransf } protected String getContentXpath(final FessConfig fessConfig, final Map xpathConfigMap) { - String xpath = xpathConfigMap.get("default.content"); + final String xpath = xpathConfigMap.get("default.content"); if (StringUtil.isNotBlank(xpath)) { return xpath; } @@ -331,7 +331,7 @@ public class FessXpathTransformer extends XpathTransformer implements FessTransf } protected String getDigestXpath(final FessConfig fessConfig, final Map xpathConfigMap) { - String xpath = xpathConfigMap.get("default.digest"); + final String xpath = xpathConfigMap.get("default.digest"); if (StringUtil.isNotBlank(xpath)) { return xpath; } @@ -398,8 +398,8 @@ public class FessXpathTransformer extends XpathTransformer implements FessTransf protected Node pruneNode(final Node node) { final NodeList nodeList = node.getChildNodes(); - final List childNodeList = new ArrayList(); - final List removedNodeList = new ArrayList(); + final List childNodeList = new ArrayList<>(); + final List removedNodeList = new ArrayList<>(); for (int i = 0; i < nodeList.getLength(); i++) { final Node childNode = nodeList.item(i); if (isPrunedTag(childNode.getNodeName())) { diff --git a/src/main/java/org/codelibs/fess/dict/DictionaryFile.java b/src/main/java/org/codelibs/fess/dict/DictionaryFile.java index b6097c2c0..1981eaae0 100644 --- a/src/main/java/org/codelibs/fess/dict/DictionaryFile.java +++ b/src/main/java/org/codelibs/fess/dict/DictionaryFile.java @@ -241,7 +241,7 @@ public abstract class DictionaryFile { if (endPage > allPageCount) { endPage = allPageCount; } - final List pageNumberList = new ArrayList(); + final List pageNumberList = new ArrayList<>(); for (int i = startPage; i <= endPage; i++) { pageNumberList.add(i); } 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 7135b8f82..8dfc0dd00 100644 --- a/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiFile.java +++ b/src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiFile.java @@ -79,7 +79,7 @@ public class KuromojiFile extends DictionaryFile { } if (offset >= kuromojiItemList.size() || offset < 0) { - return new PagingList(Collections. emptyList(), offset, size, kuromojiItemList.size()); + return new PagingList<>(Collections. emptyList(), offset, size, kuromojiItemList.size()); } int toIndex = offset + size; @@ -87,7 +87,7 @@ public class KuromojiFile extends DictionaryFile { toIndex = kuromojiItemList.size(); } - return new PagingList(kuromojiItemList.subList(offset, toIndex), offset, size, kuromojiItemList.size()); + return new PagingList<>(kuromojiItemList.subList(offset, toIndex), offset, size, kuromojiItemList.size()); } @Override @@ -114,7 +114,7 @@ public class KuromojiFile extends DictionaryFile { } protected void reload(final KuromojiUpdater updater, final InputStream in) { - final List itemList = new ArrayList(); + final List itemList = new ArrayList<>(); try (BufferedReader reader = new BufferedReader(new InputStreamReader(in != null ? in : dictionaryManager.getContentInputStream(this), Constants.UTF_8))) { long id = 0; diff --git a/src/main/java/org/codelibs/fess/dict/seunjeon/SeunjeonFile.java b/src/main/java/org/codelibs/fess/dict/seunjeon/SeunjeonFile.java index c762a4af9..3852aa75b 100644 --- a/src/main/java/org/codelibs/fess/dict/seunjeon/SeunjeonFile.java +++ b/src/main/java/org/codelibs/fess/dict/seunjeon/SeunjeonFile.java @@ -78,7 +78,7 @@ public class SeunjeonFile extends DictionaryFile { } if (offset >= seunjeonItemList.size() || offset < 0) { - return new PagingList(Collections. emptyList(), offset, size, seunjeonItemList.size()); + return new PagingList<>(Collections. emptyList(), offset, size, seunjeonItemList.size()); } int toIndex = offset + size; @@ -86,7 +86,7 @@ public class SeunjeonFile extends DictionaryFile { toIndex = seunjeonItemList.size(); } - return new PagingList(seunjeonItemList.subList(offset, toIndex), offset, size, seunjeonItemList.size()); + return new PagingList<>(seunjeonItemList.subList(offset, toIndex), offset, size, seunjeonItemList.size()); } @Override @@ -113,7 +113,7 @@ public class SeunjeonFile extends DictionaryFile { } protected void reload(final SynonymUpdater updater, final InputStream in) { - final List itemList = new ArrayList(); + final List itemList = new ArrayList<>(); try (BufferedReader reader = new BufferedReader(new InputStreamReader(in != null ? in : dictionaryManager.getContentInputStream(this), Constants.UTF_8))) { long id = 0; @@ -127,7 +127,7 @@ public class SeunjeonFile extends DictionaryFile { } final List inputStrings = split(line, ","); - String[] inputs = new String[inputStrings.size()]; + final String[] inputs = new String[inputStrings.size()]; for (int i = 0; i < inputs.length; i++) { inputs[i] = unescape(inputStrings.get(i)).trim(); } @@ -160,7 +160,7 @@ public class SeunjeonFile extends DictionaryFile { } private static List split(final String s, final String separator) { - final List list = new ArrayList(2); + final List list = new ArrayList<>(2); StringBuilder sb = new StringBuilder(); int pos = 0; final int end = s.length(); 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 f39a57094..66c1f67cc 100644 --- a/src/main/java/org/codelibs/fess/dict/synonym/SynonymFile.java +++ b/src/main/java/org/codelibs/fess/dict/synonym/SynonymFile.java @@ -78,7 +78,7 @@ public class SynonymFile extends DictionaryFile { } if (offset >= synonymItemList.size() || offset < 0) { - return new PagingList(Collections. emptyList(), offset, size, synonymItemList.size()); + return new PagingList<>(Collections. emptyList(), offset, size, synonymItemList.size()); } int toIndex = offset + size; @@ -86,7 +86,7 @@ public class SynonymFile extends DictionaryFile { toIndex = synonymItemList.size(); } - return new PagingList(synonymItemList.subList(offset, toIndex), offset, size, synonymItemList.size()); + return new PagingList<>(synonymItemList.subList(offset, toIndex), offset, size, synonymItemList.size()); } @Override @@ -114,7 +114,7 @@ public class SynonymFile extends DictionaryFile { } protected void reload(final SynonymUpdater updater, final InputStream in) { - final List itemList = new ArrayList(); + final List itemList = new ArrayList<>(); try (BufferedReader reader = new BufferedReader(new InputStreamReader(in != null ? in : dictionaryManager.getContentInputStream(this), Constants.UTF_8))) { long id = 0; @@ -197,7 +197,7 @@ public class SynonymFile extends DictionaryFile { } private static List split(final String s, final String separator) { - final List list = new ArrayList(2); + final List list = new ArrayList<>(2); StringBuilder sb = new StringBuilder(); int pos = 0; final int end = s.length(); diff --git a/src/main/java/org/codelibs/fess/ds/DataStoreFactory.java b/src/main/java/org/codelibs/fess/ds/DataStoreFactory.java index ca6cb7c51..1616f2f77 100644 --- a/src/main/java/org/codelibs/fess/ds/DataStoreFactory.java +++ b/src/main/java/org/codelibs/fess/ds/DataStoreFactory.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Set; public class DataStoreFactory { - protected Map dataStoreMap = new LinkedHashMap(); + protected Map dataStoreMap = new LinkedHashMap<>(); public void add(final String name, final DataStore dataStore) { if (name == null || dataStore == null) { @@ -37,7 +37,7 @@ public class DataStoreFactory { public List getDataStoreNameList() { final Set nameSet = dataStoreMap.keySet(); - final List nameList = new ArrayList(); + final List nameList = new ArrayList<>(); nameList.addAll(nameSet); return nameList; } diff --git a/src/main/java/org/codelibs/fess/ds/impl/AbstractDataStoreImpl.java b/src/main/java/org/codelibs/fess/ds/impl/AbstractDataStoreImpl.java index ab433c319..edf80754d 100644 --- a/src/main/java/org/codelibs/fess/ds/impl/AbstractDataStoreImpl.java +++ b/src/main/java/org/codelibs/fess/ds/impl/AbstractDataStoreImpl.java @@ -61,7 +61,7 @@ public abstract class AbstractDataStoreImpl implements DataStore { final Map paramMap = initParamMap; // default values - final Map defaultDataMap = new HashMap(); + final Map defaultDataMap = new HashMap<>(); // cid final String configId = config.getConfigId(); @@ -79,13 +79,13 @@ public abstract class AbstractDataStoreImpl implements DataStore { // boost defaultDataMap.put(fessConfig.getIndexFieldBoost(), config.getBoost().toString()); // label: labelType - final List labelTypeList = new ArrayList(); + final List labelTypeList = new ArrayList<>(); for (final String labelType : config.getLabelTypeValues()) { labelTypeList.add(labelType); } defaultDataMap.put(fessConfig.getIndexFieldLabel(), labelTypeList); // role: roleType - final List roleTypeList = new ArrayList(); + final List roleTypeList = new ArrayList<>(); StreamUtil.of(config.getPermissions()).forEach(p -> roleTypeList.add(p)); defaultDataMap.put(fessConfig.getIndexFieldRole(), roleTypeList); // mimetype diff --git a/src/main/java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java b/src/main/java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java index 011d0abd7..a696f6123 100644 --- a/src/main/java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java +++ b/src/main/java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java @@ -85,7 +85,7 @@ public class CsvDataStoreImpl extends AbstractDataStoreImpl { protected List getCsvFileList(final Map paramMap) { String value = paramMap.get(CSV_FILES_PARAM); - final List fileList = new ArrayList(); + final List fileList = new ArrayList<>(); if (StringUtil.isBlank(value)) { value = paramMap.get(CSV_DIRS_PARAM); if (StringUtil.isBlank(value)) { @@ -186,9 +186,9 @@ public class CsvDataStoreImpl extends AbstractDataStoreImpl { List list; boolean loop = true; while ((list = csvReader.readValues()) != null && loop && alive) { - final Map dataMap = new HashMap(); + final Map dataMap = new HashMap<>(); dataMap.putAll(defaultDataMap); - final Map resultMap = new LinkedHashMap(); + final Map resultMap = new LinkedHashMap<>(); resultMap.putAll(paramMap); resultMap.put("csvfile", csvFile.getAbsolutePath()); resultMap.put("csvfilename", csvFile.getName()); @@ -258,7 +258,7 @@ public class CsvDataStoreImpl extends AbstractDataStoreImpl { String url; if (target instanceof DataStoreCrawlingException) { - DataStoreCrawlingException dce = (DataStoreCrawlingException) target; + final DataStoreCrawlingException dce = (DataStoreCrawlingException) target; url = dce.getUrl(); if (dce.aborted()) { loop = false; diff --git a/src/main/java/org/codelibs/fess/ds/impl/CsvListDataStoreImpl.java b/src/main/java/org/codelibs/fess/ds/impl/CsvListDataStoreImpl.java index 026114b22..7bd1a25c4 100644 --- a/src/main/java/org/codelibs/fess/ds/impl/CsvListDataStoreImpl.java +++ b/src/main/java/org/codelibs/fess/ds/impl/CsvListDataStoreImpl.java @@ -56,7 +56,7 @@ public class CsvListDataStoreImpl extends CsvDataStoreImpl { if (paramMap.containsKey(Constants.NUM_OF_THREADS)) { try { nThreads = Integer.parseInt(paramMap.get(Constants.NUM_OF_THREADS)); - } catch (NumberFormatException e) { + } catch (final NumberFormatException e) { logger.warn(Constants.NUM_OF_THREADS + " is not int value.", e); } } @@ -66,7 +66,7 @@ public class CsvListDataStoreImpl extends CsvDataStoreImpl { new FileListIndexUpdateCallbackImpl(callback, crawlerClientFactory, nThreads)) { super.storeData(dataConfig, fileListIndexUpdateCallback, paramMap, scriptMap, defaultDataMap); fileListIndexUpdateCallback.commit(); - } catch (Exception e) { + } catch (final Exception e) { throw new DataStoreException(e); } } diff --git a/src/main/java/org/codelibs/fess/ds/impl/DatabaseDataStoreImpl.java b/src/main/java/org/codelibs/fess/ds/impl/DatabaseDataStoreImpl.java index 480cd4fe7..e198ccfcc 100644 --- a/src/main/java/org/codelibs/fess/ds/impl/DatabaseDataStoreImpl.java +++ b/src/main/java/org/codelibs/fess/ds/impl/DatabaseDataStoreImpl.java @@ -106,7 +106,7 @@ public class DatabaseDataStoreImpl extends AbstractDataStoreImpl { rs = stmt.executeQuery(sql); // SQL generated by an administrator boolean loop = true; while (rs.next() && loop && alive) { - final Map dataMap = new HashMap(); + final Map dataMap = new HashMap<>(); dataMap.putAll(defaultDataMap); for (final Map.Entry entry : scriptMap.entrySet()) { final Object convertValue = convertValue(entry.getValue(), rs, paramMap); @@ -138,7 +138,7 @@ public class DatabaseDataStoreImpl extends AbstractDataStoreImpl { String url; if (target instanceof DataStoreCrawlingException) { - DataStoreCrawlingException dce = (DataStoreCrawlingException) target; + final DataStoreCrawlingException dce = (DataStoreCrawlingException) target; url = dce.getUrl(); if (dce.aborted()) { loop = false; diff --git a/src/main/java/org/codelibs/fess/ds/impl/EsDataStoreImpl.java b/src/main/java/org/codelibs/fess/ds/impl/EsDataStoreImpl.java index a788ff589..89cee3b39 100644 --- a/src/main/java/org/codelibs/fess/ds/impl/EsDataStoreImpl.java +++ b/src/main/java/org/codelibs/fess/ds/impl/EsDataStoreImpl.java @@ -90,14 +90,14 @@ public class EsDataStoreImpl extends AbstractDataStoreImpl { .build(); logger.info("Connecting to " + hostsStr + " with [" + settings.toDelimitedString(',') + "]"); final InetSocketTransportAddress[] addresses = StreamUtil.of(hostsStr.split(",")).map(h -> { - String[] values = h.trim().split(":"); + final String[] values = h.trim().split(":"); try { if (values.length == 1) { return new InetSocketTransportAddress(InetAddress.getByName(values[0]), 9300); } else if (values.length == 2) { return new InetSocketTransportAddress(InetAddress.getByName(values[0]), Integer.parseInt(values[1])); } - } catch (Exception e) { + } catch (final Exception e) { logger.warn("Failed to parse address: " + h, e); } return null; @@ -151,7 +151,7 @@ public class EsDataStoreImpl extends AbstractDataStoreImpl { break; } - final Map dataMap = new HashMap(); + final Map dataMap = new HashMap<>(); dataMap.putAll(defaultDataMap); final Map resultMap = new LinkedHashMap<>(); resultMap.putAll(paramMap); @@ -204,7 +204,7 @@ public class EsDataStoreImpl extends AbstractDataStoreImpl { String url; if (target instanceof DataStoreCrawlingException) { - DataStoreCrawlingException dce = (DataStoreCrawlingException) target; + final DataStoreCrawlingException dce = (DataStoreCrawlingException) target; url = dce.getUrl(); if (dce.aborted()) { loop = false; diff --git a/src/main/java/org/codelibs/fess/ds/impl/EsListDataStoreImpl.java b/src/main/java/org/codelibs/fess/ds/impl/EsListDataStoreImpl.java index 1fe98be1e..7ac60664b 100644 --- a/src/main/java/org/codelibs/fess/ds/impl/EsListDataStoreImpl.java +++ b/src/main/java/org/codelibs/fess/ds/impl/EsListDataStoreImpl.java @@ -36,7 +36,7 @@ public class EsListDataStoreImpl extends EsDataStoreImpl { if (paramMap.containsKey(Constants.NUM_OF_THREADS)) { try { nThreads = Integer.parseInt(paramMap.get(Constants.NUM_OF_THREADS)); - } catch (NumberFormatException e) { + } catch (final NumberFormatException e) { logger.warn(Constants.NUM_OF_THREADS + " is not int value.", e); } } @@ -46,7 +46,7 @@ public class EsListDataStoreImpl extends EsDataStoreImpl { new FileListIndexUpdateCallbackImpl(callback, crawlerClientFactory, nThreads)) { super.storeData(dataConfig, fileListIndexUpdateCallback, paramMap, scriptMap, defaultDataMap); fileListIndexUpdateCallback.commit(); - } catch (Exception e) { + } catch (final Exception e) { throw new DataStoreException(e); } } diff --git a/src/main/java/org/codelibs/fess/ds/impl/FileListIndexUpdateCallbackImpl.java b/src/main/java/org/codelibs/fess/ds/impl/FileListIndexUpdateCallbackImpl.java index e44486567..e3e3012ab 100644 --- a/src/main/java/org/codelibs/fess/ds/impl/FileListIndexUpdateCallbackImpl.java +++ b/src/main/java/org/codelibs/fess/ds/impl/FileListIndexUpdateCallbackImpl.java @@ -54,11 +54,11 @@ public class FileListIndexUpdateCallbackImpl implements IndexUpdateCallback, Aut protected CrawlerClientFactory crawlerClientFactory; - protected List deleteIdList = new ArrayList(100); + protected List deleteIdList = new ArrayList<>(100); protected int maxDeleteDocumentCacheSize = 100; - private ExecutorService executor; + private final ExecutorService executor; protected FileListIndexUpdateCallbackImpl(final IndexUpdateCallback indexUpdateCallback, final CrawlerClientFactory crawlerClientFactory, final int nThreads) { @@ -67,7 +67,7 @@ public class FileListIndexUpdateCallbackImpl implements IndexUpdateCallback, Aut executor = newFixedThreadPool(nThreads < 1 ? 1 : nThreads); } - protected ExecutorService newFixedThreadPool(int nThreads) { + protected ExecutorService newFixedThreadPool(final int nThreads) { if (logger.isDebugEnabled()) { logger.debug("Executor Thread Pool: " + nThreads); } @@ -92,7 +92,7 @@ public class FileListIndexUpdateCallbackImpl implements IndexUpdateCallback, Aut }); } - protected String getParamValue(Map paramMap, String key, String defaultValue) { + protected String getParamValue(final Map paramMap, final String key, final String defaultValue) { return paramMap.getOrDefault(key, defaultValue); } @@ -118,7 +118,7 @@ public class FileListIndexUpdateCallbackImpl implements IndexUpdateCallback, Aut if (dataMap.containsKey(Constants.SESSION_ID)) { responseData.setSessionId((String) dataMap.get(Constants.SESSION_ID)); } else { - responseData.setSessionId((String) paramMap.get(Constants.CRAWLING_INFO_ID)); + responseData.setSessionId(paramMap.get(Constants.CRAWLING_INFO_ID)); } final RuleManager ruleManager = SingletonLaContainer.getComponent(RuleManager.class); @@ -221,7 +221,7 @@ public class FileListIndexUpdateCallbackImpl implements IndexUpdateCallback, Aut return indexUpdateCallback.getExecuteTime(); } - public void setMaxDeleteDocumentCacheSize(int maxDeleteDocumentCacheSize) { + public void setMaxDeleteDocumentCacheSize(final int maxDeleteDocumentCacheSize) { this.maxDeleteDocumentCacheSize = maxDeleteDocumentCacheSize; } diff --git a/src/main/java/org/codelibs/fess/entity/FacetQueryView.java b/src/main/java/org/codelibs/fess/entity/FacetQueryView.java index 5e7e34b2b..9de6ded16 100644 --- a/src/main/java/org/codelibs/fess/entity/FacetQueryView.java +++ b/src/main/java/org/codelibs/fess/entity/FacetQueryView.java @@ -21,7 +21,7 @@ import java.util.Map; public class FacetQueryView { protected String title; - protected Map queryMap = new LinkedHashMap(); + protected Map queryMap = new LinkedHashMap<>(); public String getTitle() { return title; diff --git a/src/main/java/org/codelibs/fess/entity/GeoInfo.java b/src/main/java/org/codelibs/fess/entity/GeoInfo.java index 9ad4b2f46..dc88fe4b8 100644 --- a/src/main/java/org/codelibs/fess/entity/GeoInfo.java +++ b/src/main/java/org/codelibs/fess/entity/GeoInfo.java @@ -36,7 +36,7 @@ public class GeoInfo { private QueryBuilder builder; - public GeoInfo(HttpServletRequest request) { + public GeoInfo(final HttpServletRequest request) { final FessConfig fessConfig = ComponentUtil.getFessConfig(); final String[] geoFields = fessConfig.getQueryGeoFieldsAsArray(); @@ -48,9 +48,9 @@ public class GeoInfo { .forEach( e -> { final String key = e.getKey(); - for (String geoField : geoFields) { + for (final String geoField : geoFields) { if (key.startsWith("geo." + geoField + ".")) { - String distanceKey = key.replaceFirst(".point$", ".distance"); + final String distanceKey = key.replaceFirst(".point$", ".distance"); final String distance = request.getParameter(distanceKey); if (StringUtil.isNotBlank(distance)) { StreamUtil.of(e.getValue()).forEach( @@ -60,14 +60,14 @@ public class GeoInfo { list = new ArrayList<>(); geoMap.put(geoField, list); } - String[] values = pt.split(","); + final String[] values = pt.split(","); if (values.length == 2) { try { - double lat = Double.parseDouble(values[0]); - double lon = Double.parseDouble(values[1]); + final double lat = Double.parseDouble(values[0]); + final double lon = Double.parseDouble(values[1]); list.add(QueryBuilders.geoDistanceQuery(geoField).distance(distance).lat(lat) .lon(lon)); - } catch (Exception ex) { + } catch (final Exception ex) { throw new InvalidQueryException(messages -> messages .addErrorsInvalidQueryUnknown(UserMessages.GLOBAL_PROPERTY_KEY), ex .getLocalizedMessage()); @@ -84,11 +84,11 @@ public class GeoInfo { } }); - QueryBuilder[] queryBuilders = geoMap.values().stream().map(list -> { + final QueryBuilder[] queryBuilders = geoMap.values().stream().map(list -> { if (list.size() == 1) { return list.get(0); } else if (list.size() > 1) { - BoolQueryBuilder boolQuery = QueryBuilders.boolQuery(); + final BoolQueryBuilder boolQuery = QueryBuilders.boolQuery(); list.forEach(q -> boolQuery.should(q)); return boolQuery; } @@ -98,7 +98,7 @@ public class GeoInfo { if (queryBuilders.length == 1) { builder = queryBuilders[0]; } else if (queryBuilders.length > 1) { - BoolQueryBuilder boolQuery = QueryBuilders.boolQuery(); + final BoolQueryBuilder boolQuery = QueryBuilders.boolQuery(); StreamUtil.of(queryBuilders).forEach(q -> boolQuery.must(q)); builder = boolQuery; } diff --git a/src/main/java/org/codelibs/fess/entity/SearchRequestParams.java b/src/main/java/org/codelibs/fess/entity/SearchRequestParams.java index 4f023835e..6b8efd0f9 100644 --- a/src/main/java/org/codelibs/fess/entity/SearchRequestParams.java +++ b/src/main/java/org/codelibs/fess/entity/SearchRequestParams.java @@ -49,43 +49,43 @@ public interface SearchRequestParams { Locale getLocale(); - public default String[] simplifyArray(String[] values) { + public default String[] simplifyArray(final String[] values) { return StreamUtil.of(values).filter(q -> StringUtil.isNotBlank(q)).distinct().toArray(n -> new String[n]); } - public default String[] getParamValueArray(HttpServletRequest request, String param) { + public default String[] getParamValueArray(final HttpServletRequest request, final String param) { return simplifyArray(request.getParameterValues(param)); } - public default FacetInfo createFacetInfo(HttpServletRequest request) { - String[] fields = getParamValueArray(request, "facet.field"); - String[] queries = getParamValueArray(request, "facet.query"); + public default FacetInfo createFacetInfo(final HttpServletRequest request) { + final String[] fields = getParamValueArray(request, "facet.field"); + final String[] queries = getParamValueArray(request, "facet.query"); if (fields.length == 0 && queries.length == 0) { return null; } - FacetInfo facetInfo = new FacetInfo(); + final FacetInfo facetInfo = new FacetInfo(); facetInfo.field = fields; facetInfo.query = queries; - String sizeStr = request.getParameter("facet.size"); + final String sizeStr = request.getParameter("facet.size"); if (StringUtil.isNotBlank(sizeStr)) { facetInfo.size = Integer.parseInt(sizeStr); } - String minDocCountStr = request.getParameter("facet.minDocCount"); + final String minDocCountStr = request.getParameter("facet.minDocCount"); if (StringUtil.isNotBlank(minDocCountStr)) { facetInfo.minDocCount = Long.parseLong(minDocCountStr); } - String sort = request.getParameter("facet.sort"); + final String sort = request.getParameter("facet.sort"); if (StringUtil.isNotBlank(sort)) { facetInfo.sort = sort; } - String missing = request.getParameter("facet.missing"); + final String missing = request.getParameter("facet.missing"); if (StringUtil.isNotBlank(missing)) { facetInfo.missing = missing; } return facetInfo; } - public default GeoInfo createGeoInfo(HttpServletRequest request) { + public default GeoInfo createGeoInfo(final HttpServletRequest request) { return new GeoInfo(request); } } 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 5310bdac1..19f45b2b9 100644 --- a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java +++ b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java @@ -310,7 +310,7 @@ public class FessEsClient implements Client { final String configType = values[1]; boolean exists = false; try { - IndicesExistsResponse response = + final IndicesExistsResponse response = client.admin().indices().prepareExists(configIndex).execute().actionGet(fessConfig.getIndexSearchTimeout()); exists = response.isExists(); } catch (final Exception e) { @@ -369,13 +369,13 @@ public class FessEsClient implements Client { // alias final String aliasConfigDirPath = indexConfigPath + "/" + configIndex + "/alias"; try { - File aliasConfigDir = ResourceUtil.getResourceAsFile(aliasConfigDirPath); + final File aliasConfigDir = ResourceUtil.getResourceAsFile(aliasConfigDirPath); if (aliasConfigDir.isDirectory()) { StreamUtil.of(aliasConfigDir.listFiles((dir, name) -> name.endsWith(".json"))).forEach( f -> { final String aliasName = f.getName().replaceFirst(".json$", ""); final String source = FileUtil.readUTF8(f); - IndicesAliasesResponse response = + final IndicesAliasesResponse response = client.admin().indices().prepareAliases().addAlias(configIndex, aliasName, source).execute() .actionGet(fessConfig.getIndexIndicesTimeout()); if (response.isAcknowledged()) { @@ -385,9 +385,9 @@ public class FessEsClient implements Client { } }); } - } catch (ResourceNotFoundRuntimeException e) { + } catch (final ResourceNotFoundRuntimeException e) { // ignore - } catch (Exception e) { + } catch (final Exception e) { logger.warn(aliasConfigDirPath + " is not found.", e); } } @@ -486,7 +486,7 @@ public class FessEsClient implements Client { try { client.admin().indices().prepareFlush().setForce(true).execute() .actionGet(ComponentUtil.getFessConfig().getIndexIndicesTimeout()); - } catch (Exception e) { + } catch (final Exception e) { logger.warn("Failed to flush indices.", e); } try { 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 8582e2efc..29157e553 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 @@ -185,7 +185,7 @@ public class DataConfig extends BsDataConfig implements CrawlingConfig { public void initializeClientFactory(final CrawlerClientFactory crawlerClientFactory) { final Map paramMap = getHandlerParameterMap(); - final Map factoryParamMap = new HashMap(); + final Map factoryParamMap = new HashMap<>(); crawlerClientFactory.setInitParameterMap(factoryParamMap); // parameters @@ -206,7 +206,7 @@ public class DataConfig extends BsDataConfig implements CrawlingConfig { final String webAuthStr = paramMap.get(CRAWLER_WEB_AUTH); if (StringUtil.isNotBlank(webAuthStr)) { final String[] webAuthNames = webAuthStr.split(","); - final List basicAuthList = new ArrayList(); + final List basicAuthList = new ArrayList<>(); for (final String webAuthName : webAuthNames) { final String scheme = paramMap.get(CRAWLER_WEB_AUTH + "." + webAuthName + ".scheme"); final String hostname = paramMap.get(CRAWLER_WEB_AUTH + "." + webAuthName + ".host"); @@ -272,8 +272,7 @@ public class DataConfig extends BsDataConfig implements CrawlingConfig { } // request header - final List rhList = - new ArrayList(); + final List rhList = new ArrayList<>(); int count = 1; String headerName = paramMap.get(CRAWLER_WEB_HEADER_PREFIX + count + ".name"); while (StringUtil.isNotBlank(headerName)) { 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 e3124b931..dadb0f592 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 @@ -53,7 +53,7 @@ public class FileAuthentication extends BsFileAuthentication { final FileConfigService fileConfigService = ComponentUtil.getComponent(FileConfigService.class); try { fileConfig = fileConfigService.getFileConfig(getFileConfigId()).get(); - } catch (Exception e) { + } catch (final Exception e) { logger.warn("File Config " + getFileConfigId() + " does not exist.", e); } } 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 25f8a6cc6..8418a146e 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 @@ -146,7 +146,7 @@ public class FileConfig extends BsFileConfig implements CrawlingConfig { if (includedDocPathPatterns == null) { if (StringUtil.isNotBlank(getIncludedDocPaths())) { - final List pathPatterList = new ArrayList(); + final List pathPatterList = new ArrayList<>(); final String[] paths = getIncludedDocPaths().split("[\r\n]"); for (final String u : paths) { if (StringUtil.isNotBlank(u) && !u.trim().startsWith("#")) { @@ -161,7 +161,7 @@ public class FileConfig extends BsFileConfig implements CrawlingConfig { if (excludedDocPathPatterns == null) { if (StringUtil.isNotBlank(getExcludedDocPaths())) { - final List pathPatterList = new ArrayList(); + final List pathPatterList = new ArrayList<>(); final String[] paths = getExcludedDocPaths().split("[\r\n]"); for (final String u : paths) { if (StringUtil.isNotBlank(u) && !u.trim().startsWith("#")) { @@ -202,7 +202,7 @@ public class FileConfig extends BsFileConfig implements CrawlingConfig { final FileAuthenticationService fileAuthenticationService = ComponentUtil.getComponent(FileAuthenticationService.class); // Parameters - final Map paramMap = new HashMap(); + final Map paramMap = new HashMap<>(); clientFactory.setInitParameterMap(paramMap); final Map clientConfigMap = getConfigParameterMap(ConfigName.CLIENT); 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 0aee1b389..5d9e5b453 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 @@ -57,7 +57,7 @@ public class RequestHeader extends BsRequestHeader { final WebConfigService webConfigService = ComponentUtil.getComponent(WebConfigService.class); try { webConfig = webConfigService.getWebConfig(getWebConfigId()).get(); - } catch (Exception e) { + } catch (final Exception e) { logger.warn("Web Config " + getWebConfigId() + " does not exist.", e); } } 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 6e3ab13b2..1f3981e1c 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 @@ -110,7 +110,7 @@ public class WebAuthentication extends BsWebAuthentication { final WebConfigService webConfigService = ComponentUtil.getComponent(WebConfigService.class); try { webConfig = webConfigService.getWebConfig(getWebConfigId()).get(); - } catch (Exception e) { + } catch (final Exception e) { logger.warn("Web Config " + getWebConfigId() + " does not exist.", e); } } 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 37ffef3e8..3b42fc728 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 @@ -145,7 +145,7 @@ public class WebConfig extends BsWebConfig implements CrawlingConfig { if (includedDocUrlPatterns == null) { if (StringUtil.isNotBlank(getIncludedDocUrls())) { - final List urlPatterList = new ArrayList(); + final List urlPatterList = new ArrayList<>(); final String[] urls = getIncludedDocUrls().split("[\r\n]"); for (final String u : urls) { if (StringUtil.isNotBlank(u) && !u.trim().startsWith("#")) { @@ -160,7 +160,7 @@ public class WebConfig extends BsWebConfig implements CrawlingConfig { if (excludedDocUrlPatterns == null) { if (StringUtil.isNotBlank(getExcludedDocUrls())) { - final List urlPatterList = new ArrayList(); + final List urlPatterList = new ArrayList<>(); final String[] urls = getExcludedDocUrls().split("[\r\n]"); for (final String u : urls) { if (StringUtil.isNotBlank(u) && !u.trim().startsWith("#")) { @@ -202,7 +202,7 @@ public class WebConfig extends BsWebConfig implements CrawlingConfig { final RequestHeaderService requestHeaderService = ComponentUtil.getComponent(RequestHeaderService.class); // HttpClient Parameters - final Map paramMap = new HashMap(); + final Map paramMap = new HashMap<>(); clientFactory.setInitParameterMap(paramMap); final Map clientConfigMap = getConfigParameterMap(ConfigName.CLIENT); @@ -216,7 +216,7 @@ public class WebConfig extends BsWebConfig implements CrawlingConfig { } final List webAuthList = webAuthenticationService.getWebAuthenticationList(getId()); - final List basicAuthList = new ArrayList(); + final List basicAuthList = new ArrayList<>(); for (final WebAuthentication webAuth : webAuthList) { basicAuthList.add(webAuth.getAuthentication()); } @@ -224,8 +224,7 @@ public class WebConfig extends BsWebConfig implements CrawlingConfig { // request header final List requestHeaderList = requestHeaderService.getRequestHeaderList(getId()); - final List rhList = - new ArrayList(); + final List rhList = new ArrayList<>(); for (final RequestHeader requestHeader : requestHeaderList) { rhList.add(requestHeader.getCrawlerRequestHeader()); } diff --git a/src/main/java/org/codelibs/fess/exception/ContainerNotAvailableException.java b/src/main/java/org/codelibs/fess/exception/ContainerNotAvailableException.java index f8b04fb29..ef84a341e 100644 --- a/src/main/java/org/codelibs/fess/exception/ContainerNotAvailableException.java +++ b/src/main/java/org/codelibs/fess/exception/ContainerNotAvailableException.java @@ -19,7 +19,7 @@ public class ContainerNotAvailableException extends FessSystemException { private static final long serialVersionUID = 1L; - public ContainerNotAvailableException(Throwable cause) { + public ContainerNotAvailableException(final Throwable cause) { super(cause); } diff --git a/src/main/java/org/codelibs/fess/exception/DataStoreCrawlingException.java b/src/main/java/org/codelibs/fess/exception/DataStoreCrawlingException.java index 16b6f79f5..ed9693d19 100644 --- a/src/main/java/org/codelibs/fess/exception/DataStoreCrawlingException.java +++ b/src/main/java/org/codelibs/fess/exception/DataStoreCrawlingException.java @@ -23,7 +23,7 @@ public class DataStoreCrawlingException extends CrawlingAccessException { private final String url; - private boolean abort; + private final boolean abort; public DataStoreCrawlingException(final String url, final String message, final Exception e) { this(url, message, e, false); diff --git a/src/main/java/org/codelibs/fess/exec/Crawler.java b/src/main/java/org/codelibs/fess/exec/Crawler.java index d76c48af9..b02021858 100644 --- a/src/main/java/org/codelibs/fess/exec/Crawler.java +++ b/src/main/java/org/codelibs/fess/exec/Crawler.java @@ -169,7 +169,7 @@ public class Crawler implements Serializable { System.getProperties().entrySet().stream().forEach(e -> logger.debug("Property: " + e.getKey() + "=" + e.getValue())); System.getenv().entrySet().forEach(e -> logger.debug("Env: " + e.getKey() + "=" + e.getValue())); logger.debug("Option: " + options); - } catch (Exception e) { + } catch (final Exception e) { // ignore } } diff --git a/src/main/java/org/codelibs/fess/exec/SuggestCreator.java b/src/main/java/org/codelibs/fess/exec/SuggestCreator.java index 122438c67..10cc4f98e 100644 --- a/src/main/java/org/codelibs/fess/exec/SuggestCreator.java +++ b/src/main/java/org/codelibs/fess/exec/SuggestCreator.java @@ -87,7 +87,7 @@ public class SuggestCreator implements Serializable { System.getProperties().entrySet().stream().forEach(e -> logger.debug("Property: " + e.getKey() + "=" + e.getValue())); System.getenv().entrySet().forEach(e -> logger.debug("Env: " + e.getKey() + "=" + e.getValue())); logger.debug("Option: " + options); - } catch (Exception e) { + } catch (final Exception e) { // ignore } } diff --git a/src/main/java/org/codelibs/fess/helper/ActivityHelper.java b/src/main/java/org/codelibs/fess/helper/ActivityHelper.java index 40b60f534..e53c0aec7 100644 --- a/src/main/java/org/codelibs/fess/helper/ActivityHelper.java +++ b/src/main/java/org/codelibs/fess/helper/ActivityHelper.java @@ -102,7 +102,7 @@ public class ActivityHelper { LOGIN, LOGOUT, ACCESS; } - public void setLoggerName(String loggerName) { + public void setLoggerName(final String loggerName) { this.loggerName = loggerName; } } diff --git a/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java index 0f2d59461..ad7f87f7f 100644 --- a/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java +++ b/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java @@ -34,7 +34,7 @@ public class CrawlingConfigHelper implements Serializable { private static final Logger logger = LoggerFactory.getLogger(CrawlingConfigHelper.class); - protected final Map crawlingConfigMap = new ConcurrentHashMap(); + protected final Map crawlingConfigMap = new ConcurrentHashMap<>(); protected int count = 1; diff --git a/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java index 36c9e78ff..34f57b975 100644 --- a/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java +++ b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java @@ -81,7 +81,7 @@ public class CrawlingInfoHelper implements Serializable { } if (infoMap != null) { - final List crawlingInfoParamList = new ArrayList(); + final List crawlingInfoParamList = new ArrayList<>(); for (final Map.Entry entry : infoMap.entrySet()) { final CrawlingInfoParam crawlingInfoParam = new CrawlingInfoParam(); crawlingInfoParam.setCrawlingInfoId(crawlingInfo.getId()); @@ -144,7 +144,7 @@ public class CrawlingInfoHelper implements Serializable { public Map getInfoMap(final String sessionId) { final List crawlingInfoParamList = getCrawlingInfoService().getLastCrawlingInfoParamList(sessionId); - final Map map = new HashMap(); + final Map map = new HashMap<>(); for (final CrawlingInfoParam crawlingInfoParam : crawlingInfoParamList) { map.put(crawlingInfoParam.getKey(), crawlingInfoParam.getValue()); } @@ -173,11 +173,11 @@ public class CrawlingInfoHelper implements Serializable { queryRequestBuilder.setPreference(Constants.SEARCH_PREFERENCE_PRIMARY); return true; }, (queryRequestBuilder, execTime, searchResponse) -> { - final List> sessionIdList = new ArrayList>(); + final List> sessionIdList = new ArrayList<>(); searchResponse.ifPresent(response -> { final Terms terms = response.getAggregations().get(fessConfig.getIndexFieldSegment()); for (final Bucket bucket : terms.getBuckets()) { - final Map map = new HashMap(2); + final Map map = new HashMap<>(2); map.put(fessConfig.getIndexFieldSegment(), bucket.getKey().toString()); map.put(FACET_COUNT_KEY, Long.toString(bucket.getDocCount())); sessionIdList.add(map); diff --git a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java index 857366bdc..054aed6d2 100644 --- a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java +++ b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java @@ -92,16 +92,16 @@ public class DataIndexHelper implements Serializable { } protected void doCrawl(final String sessionId, final List configList) { - int multiprocessCrawlingCount = ComponentUtil.getFessConfig().getCrawlingThreadCount(); + final int multiprocessCrawlingCount = ComponentUtil.getFessConfig().getCrawlingThreadCount(); final long startTime = System.currentTimeMillis(); final IndexUpdateCallback indexUpdateCallback = ComponentUtil.getComponent(IndexUpdateCallback.class); - final List sessionIdList = new ArrayList(); - final Map initParamMap = new HashMap(); + final List sessionIdList = new ArrayList<>(); + final Map initParamMap = new HashMap<>(); dataCrawlingThreadList.clear(); - final List dataCrawlingThreadStatusList = new ArrayList(); + final List dataCrawlingThreadStatusList = new ArrayList<>(); for (final DataConfig dataConfig : configList) { final String sid = crawlingConfigHelper.store(sessionId, dataConfig); sessionIdList.add(sid); diff --git a/src/main/java/org/codelibs/fess/helper/DuplicateHostHelper.java b/src/main/java/org/codelibs/fess/helper/DuplicateHostHelper.java index a167b4c4c..193a48239 100644 --- a/src/main/java/org/codelibs/fess/helper/DuplicateHostHelper.java +++ b/src/main/java/org/codelibs/fess/helper/DuplicateHostHelper.java @@ -34,7 +34,7 @@ public class DuplicateHostHelper implements Serializable { @PostConstruct public void init() { if (duplicateHostList == null) { - duplicateHostList = new ArrayList(); + duplicateHostList = new ArrayList<>(); } final DuplicateHostService duplicateHostService = ComponentUtil.getComponent(DuplicateHostService.class); duplicateHostList.addAll(duplicateHostService.getDuplicateHostList()); @@ -46,7 +46,7 @@ public class DuplicateHostHelper implements Serializable { public void add(final DuplicateHost duplicateHost) { if (duplicateHostList == null) { - duplicateHostList = new ArrayList(); + duplicateHostList = new ArrayList<>(); } duplicateHostList.add(duplicateHost); } diff --git a/src/main/java/org/codelibs/fess/helper/FileTypeHelper.java b/src/main/java/org/codelibs/fess/helper/FileTypeHelper.java index a4260d474..b47acb174 100644 --- a/src/main/java/org/codelibs/fess/helper/FileTypeHelper.java +++ b/src/main/java/org/codelibs/fess/helper/FileTypeHelper.java @@ -24,7 +24,7 @@ public class FileTypeHelper { protected String defaultValue = "others"; - protected Map mimetypeMap = new HashMap(); + protected Map mimetypeMap = new HashMap<>(); public void add(final String mimetype, final String filetype) { mimetypeMap.put(mimetype, filetype); diff --git a/src/main/java/org/codelibs/fess/helper/IntervalControlHelper.java b/src/main/java/org/codelibs/fess/helper/IntervalControlHelper.java index 6e14ae810..ae9ab21ca 100644 --- a/src/main/java/org/codelibs/fess/helper/IntervalControlHelper.java +++ b/src/main/java/org/codelibs/fess/helper/IntervalControlHelper.java @@ -26,7 +26,7 @@ public class IntervalControlHelper { public long crawlerWaitMillis = 10000; - protected List ruleList = new ArrayList(); + protected List ruleList = new ArrayList<>(); public void checkCrawlerStatus() { while (!crawlerRunning) { @@ -102,7 +102,7 @@ public class IntervalControlHelper { toHours = tints[0]; toMinutes = tints[1]; final String[] values = days.split(","); - final List list = new ArrayList(); + final List list = new ArrayList<>(); for (final String value : values) { try { list.add(Integer.parseInt(value.trim())); diff --git a/src/main/java/org/codelibs/fess/helper/JobHelper.java b/src/main/java/org/codelibs/fess/helper/JobHelper.java index 8af7e5b52..d84130f94 100644 --- a/src/main/java/org/codelibs/fess/helper/JobHelper.java +++ b/src/main/java/org/codelibs/fess/helper/JobHelper.java @@ -121,12 +121,12 @@ public class JobHelper { } } - public boolean isAvailable(String id) { + public boolean isAvailable(final String id) { return ComponentUtil.getComponent(ScheduledJobBhv.class).selectByPK(id).filter(e -> Boolean.TRUE.equals(e.getAvailable())) .isPresent(); } - public void store(JobLog jobLog) { + public void store(final JobLog jobLog) { ComponentUtil.getComponent(JobLogBhv.class).insertOrUpdate(jobLog, op -> { op.setRefresh(true); }); diff --git a/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java b/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java index d59e5443c..bf3f38571 100644 --- a/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java +++ b/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java @@ -44,7 +44,7 @@ public class LabelTypeHelper implements Serializable { @Resource protected RoleQueryHelper roleQueryHelper; - protected volatile List labelTypeItemList = new ArrayList(); + protected volatile List labelTypeItemList = new ArrayList<>(); protected volatile List labelTypePatternList; @@ -63,7 +63,7 @@ public class LabelTypeHelper implements Serializable { } private void buildLabelTypeItems(final List labelTypeList) { - final List itemList = new ArrayList(); + final List itemList = new ArrayList<>(); for (final LabelType labelType : labelTypeList) { final LabelTypeItem item = new LabelTypeItem(); item.setLabel(labelType.getName()); @@ -79,11 +79,11 @@ public class LabelTypeHelper implements Serializable { init(); } - final List> itemList = new ArrayList>(); + final List> itemList = new ArrayList<>(); final Set roleSet = roleQueryHelper.build(); if (roleSet.isEmpty()) { for (final LabelTypeItem item : labelTypeItemList) { - final Map map = new HashMap(2); + final Map map = new HashMap<>(2); map.put(Constants.ITEM_LABEL, item.getLabel()); map.put(Constants.ITEM_VALUE, item.getValue()); itemList.add(map); @@ -92,7 +92,7 @@ public class LabelTypeHelper implements Serializable { for (final LabelTypeItem item : labelTypeItemList) { for (final String roleValue : roleSet) { if (item.getRoleValueList().contains(roleValue)) { - final Map map = new HashMap(2); + final Map map = new HashMap<>(2); map.put(Constants.ITEM_LABEL, item.getLabel()); map.put(Constants.ITEM_VALUE, item.getValue()); itemList.add(map); @@ -110,7 +110,7 @@ public class LabelTypeHelper implements Serializable { synchronized (this) { if (labelTypePatternList == null) { final List labelTypeList = getLabelTypeService().getLabelTypeList(); - final List list = new ArrayList(); + final List list = new ArrayList<>(); for (final LabelType labelType : labelTypeList) { final String includedPaths = labelType.getIncludedPaths(); final String excludedPaths = labelType.getExcludedPaths(); @@ -132,7 +132,7 @@ public class LabelTypeHelper implements Serializable { return Collections.emptySet(); } - final Set valueSet = new HashSet(); + final Set valueSet = new HashSet<>(); for (final LabelTypePattern pattern : labelTypePatternList) { if (pattern.match(path)) { valueSet.add(pattern.getValue()); diff --git a/src/main/java/org/codelibs/fess/helper/PathMappingHelper.java b/src/main/java/org/codelibs/fess/helper/PathMappingHelper.java index 6ec94a600..e233fc07a 100644 --- a/src/main/java/org/codelibs/fess/helper/PathMappingHelper.java +++ b/src/main/java/org/codelibs/fess/helper/PathMappingHelper.java @@ -37,7 +37,7 @@ public class PathMappingHelper implements Serializable { private static final Logger logger = LoggerFactory.getLogger(PathMappingHelper.class); - private final Map> pathMappingMap = new HashMap>(); + private final Map> pathMappingMap = new HashMap<>(); volatile List cachedPathMappingList = null; diff --git a/src/main/java/org/codelibs/fess/helper/PermissionHelper.java b/src/main/java/org/codelibs/fess/helper/PermissionHelper.java index 5bb215208..5f49d3884 100644 --- a/src/main/java/org/codelibs/fess/helper/PermissionHelper.java +++ b/src/main/java/org/codelibs/fess/helper/PermissionHelper.java @@ -46,7 +46,7 @@ public class PermissionHelper { return permission; } - public String decode(String value) { + public String decode(final String value) { if (StringUtil.isBlank(value)) { return null; } @@ -62,15 +62,15 @@ public class PermissionHelper { return value; } - public void setRolePrefix(String rolePrefix) { + public void setRolePrefix(final String rolePrefix) { this.rolePrefix = rolePrefix; } - public void setGroupPrefix(String groupPrefix) { + public void setGroupPrefix(final String groupPrefix) { this.groupPrefix = groupPrefix; } - public void setUserPrefix(String userPrefix) { + public void setUserPrefix(final String userPrefix) { this.userPrefix = userPrefix; } } diff --git a/src/main/java/org/codelibs/fess/helper/PopularWordHelper.java b/src/main/java/org/codelibs/fess/helper/PopularWordHelper.java index b5995e93a..49dbd9d59 100644 --- a/src/main/java/org/codelibs/fess/helper/PopularWordHelper.java +++ b/src/main/java/org/codelibs/fess/helper/PopularWordHelper.java @@ -64,7 +64,7 @@ public class PopularWordHelper { return cache.get( getCacheKey(baseSeed, baseTags, baseRoles, baseFields, baseExcludes), () -> { - final List wordList = new ArrayList(); + final List wordList = new ArrayList<>(); final SuggestHelper suggestHelper = ComponentUtil.getSuggestHelper(); final PopularWordsRequestBuilder popularWordsRequestBuilder = suggestHelper.suggester().popularWords() diff --git a/src/main/java/org/codelibs/fess/helper/QueryHelper.java b/src/main/java/org/codelibs/fess/helper/QueryHelper.java index 918bfff95..4ccf2e18f 100644 --- a/src/main/java/org/codelibs/fess/helper/QueryHelper.java +++ b/src/main/java/org/codelibs/fess/helper/QueryHelper.java @@ -748,7 +748,7 @@ public class QueryHelper implements Serializable { } final HttpServletRequest request = LaRequestUtil.getOptionalRequest().orElse(null); - final Map queryParamMap = new HashMap(); + final Map queryParamMap = new HashMap<>(); for (final Map.Entry entry : queryRequestHeaderMap.entrySet()) { final String[] values = entry.getValue(); final String[] newValues = new String[values.length]; diff --git a/src/main/java/org/codelibs/fess/helper/RoleQueryHelper.java b/src/main/java/org/codelibs/fess/helper/RoleQueryHelper.java index 588bb16e4..0134479bb 100644 --- a/src/main/java/org/codelibs/fess/helper/RoleQueryHelper.java +++ b/src/main/java/org/codelibs/fess/helper/RoleQueryHelper.java @@ -218,7 +218,7 @@ public class RoleQueryHelper { public void addCookieNameMapping(final String cookieName, final String roleName) { if (cookieNameMap == null) { - cookieNameMap = new HashMap(); + cookieNameMap = new HashMap<>(); } cookieNameMap.put(cookieName, roleName); } diff --git a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java index 030c7f60c..e041b14fa 100644 --- a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java @@ -65,15 +65,15 @@ public class SearchLogHelper { public int userInfoCacheSize = 1000; - protected volatile Queue searchLogQueue = new ConcurrentLinkedQueue(); + protected volatile Queue searchLogQueue = new ConcurrentLinkedQueue<>(); - protected volatile Queue clickLogQueue = new ConcurrentLinkedQueue(); + protected volatile Queue clickLogQueue = new ConcurrentLinkedQueue<>(); protected Map userInfoCache; @PostConstruct public void init() { - userInfoCache = new LruHashMap(userInfoCacheSize); + userInfoCache = new LruHashMap<>(userInfoCacheSize); } public void addSearchLog(final LocalDateTime requestedTime, final String queryId, final String query, final int pageStart, @@ -139,13 +139,13 @@ public class SearchLogHelper { public void storeSearchLog() { if (!searchLogQueue.isEmpty()) { final Queue queue = searchLogQueue; - searchLogQueue = new ConcurrentLinkedQueue(); + searchLogQueue = new ConcurrentLinkedQueue<>(); processSearchLogQueue(queue); } if (!clickLogQueue.isEmpty()) { final Queue queue = clickLogQueue; - clickLogQueue = new ConcurrentLinkedQueue(); + clickLogQueue = new ConcurrentLinkedQueue<>(); processClickLogQueue(queue); } } diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java index f4bde8368..a6a05ab5d 100644 --- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java @@ -61,7 +61,7 @@ public class SystemHelper implements Serializable { private static final long serialVersionUID = 1L; - protected final Map designJspFileNameMap = new HashMap(); + protected final Map designJspFileNameMap = new HashMap<>(); protected final AtomicBoolean forceStop = new AtomicBoolean(false); diff --git a/src/main/java/org/codelibs/fess/helper/UserInfoHelper.java b/src/main/java/org/codelibs/fess/helper/UserInfoHelper.java index 887328f24..d1fa4c325 100644 --- a/src/main/java/org/codelibs/fess/helper/UserInfoHelper.java +++ b/src/main/java/org/codelibs/fess/helper/UserInfoHelper.java @@ -113,7 +113,7 @@ public class UserInfoHelper { if (session != null) { final FessConfig fessConfig = ComponentUtil.getFessConfig(); - final List docIdList = new ArrayList(); + final List docIdList = new ArrayList<>(); for (final Map map : documentItems) { final Object docId = map.get(fessConfig.getIndexFieldDocId()); if (docId != null && docId.toString().length() > 0) { @@ -144,7 +144,7 @@ public class UserInfoHelper { @SuppressWarnings("unchecked") Map resultDocIdsCache = (Map) session.getAttribute(Constants.RESULT_DOC_ID_CACHE); if (resultDocIdsCache == null) { - resultDocIdsCache = new LruHashMap(resultDocIdsCacheSize); + resultDocIdsCache = new LruHashMap<>(resultDocIdsCacheSize); session.setAttribute(Constants.RESULT_DOC_ID_CACHE, resultDocIdsCache); } return resultDocIdsCache; diff --git a/src/main/java/org/codelibs/fess/helper/ViewHelper.java b/src/main/java/org/codelibs/fess/helper/ViewHelper.java index b1a84d408..ad59bad0c 100644 --- a/src/main/java/org/codelibs/fess/helper/ViewHelper.java +++ b/src/main/java/org/codelibs/fess/helper/ViewHelper.java @@ -125,13 +125,13 @@ public class ViewHelper implements Serializable { protected boolean useSession = true; - private final Map pageCacheMap = new ConcurrentHashMap(); + private final Map pageCacheMap = new ConcurrentHashMap<>(); - private final Map initFacetParamMap = new HashMap(); + private final Map initFacetParamMap = new HashMap<>(); - private final Map initGeoParamMap = new HashMap(); + private final Map initGeoParamMap = new HashMap<>(); - private final List facetQueryViewList = new ArrayList(); + private final List facetQueryViewList = new ArrayList<>(); public String cacheTemplateName = "cache"; diff --git a/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java b/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java index 86a467aee..47f9ef65e 100644 --- a/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java +++ b/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java @@ -128,16 +128,16 @@ public class WebFsIndexHelper implements Serializable { } protected void doCrawl(final String sessionId, final List webConfigList, final List fileConfigList) { - int multiprocessCrawlingCount = ComponentUtil.getFessConfig().getCrawlingThreadCount(); + final int multiprocessCrawlingCount = ComponentUtil.getFessConfig().getCrawlingThreadCount(); final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); final FessConfig fessConfig = ComponentUtil.getFessConfig(); final long startTime = System.currentTimeMillis(); - final List sessionIdList = new ArrayList(); + final List sessionIdList = new ArrayList<>(); crawlerList.clear(); - final List crawlerStatusList = new ArrayList(); + final List crawlerStatusList = new ArrayList<>(); // Web for (final WebConfig webConfig : webConfigList) { final String sid = crawlingConfigHelper.store(sessionId, webConfig); @@ -184,7 +184,7 @@ public class WebFsIndexHelper implements Serializable { final EsUrlFilterService urlFilterService = ComponentUtil.getComponent(EsUrlFilterService.class); try { urlFilterService.delete(sid); - } catch (Exception e) { + } catch (final Exception e) { logger.warn("Failed to delete url filters for " + sid); } } @@ -301,7 +301,7 @@ public class WebFsIndexHelper implements Serializable { final EsUrlFilterService urlFilterService = ComponentUtil.getComponent(EsUrlFilterService.class); try { urlFilterService.delete(sid); - } catch (Exception e) { + } catch (final Exception e) { logger.warn("Failed to delete url filters for " + sid); } } @@ -514,7 +514,7 @@ public class WebFsIndexHelper implements Serializable { try { // clear url filter urlFilterService.delete(sid); - } catch (Exception e) { + } catch (final Exception e) { logger.warn("Failed to delete UrlFilter for " + sid, e); } @@ -522,14 +522,14 @@ public class WebFsIndexHelper implements Serializable { // clear queue urlQueueService.clearCache(); urlQueueService.delete(sid); - } catch (Exception e) { + } catch (final Exception e) { logger.warn("Failed to delete UrlQueue for " + sid, e); } try { // clear dataService.delete(sid); - } catch (Exception e) { + } catch (final Exception e) { logger.warn("Failed to delete AccessResult for " + sid, e); } } diff --git a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java index c13c1f93c..97a224ba1 100644 --- a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java +++ b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java @@ -107,6 +107,7 @@ public class IndexUpdater extends Thread { // nothing } + @Override @PreDestroy public void destroy() { if (!finishCrawling) { @@ -220,7 +221,7 @@ public class IndexUpdater extends Thread { if (arList.isEmpty()) { try { Thread.sleep(fessConfig.getIndexerWebfsCommitMarginTimeAsInteger().longValue()); - } catch (Exception e) { + } catch (final Exception e) { // ignore } cleanupTime = -1; diff --git a/src/main/java/org/codelibs/fess/job/CrawlJob.java b/src/main/java/org/codelibs/fess/job/CrawlJob.java index 2e36f7c3c..dc659dea7 100644 --- a/src/main/java/org/codelibs/fess/job/CrawlJob.java +++ b/src/main/java/org/codelibs/fess/job/CrawlJob.java @@ -142,12 +142,12 @@ public class CrawlJob { return jvmOptions(REMOTE_DEBUG_OPTIONS); } - public CrawlJob jvmOptions(String option) { + public CrawlJob jvmOptions(final String option) { this.jvmOptions = option; return this; } - public CrawlJob lastaEnv(String env) { + public CrawlJob lastaEnv(final String env) { this.lastaEnv = env; return this; } @@ -246,7 +246,7 @@ public class CrawlJob { } protected void executeCrawler() { - final List cmdList = new ArrayList(); + final List cmdList = new ArrayList<>(); final String cpSeparator = SystemUtils.IS_OS_WINDOWS ? ";" : ":"; final ServletContext servletContext = ComponentUtil.getComponent(ServletContext.class); final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); diff --git a/src/main/java/org/codelibs/fess/job/impl/GroovyExecutor.java b/src/main/java/org/codelibs/fess/job/impl/GroovyExecutor.java index d069defbc..11eb62537 100644 --- a/src/main/java/org/codelibs/fess/job/impl/GroovyExecutor.java +++ b/src/main/java/org/codelibs/fess/job/impl/GroovyExecutor.java @@ -26,7 +26,7 @@ public class GroovyExecutor extends JobExecutor { @Override public Object execute(final String script) { - Map params = new HashMap<>(); + final Map params = new HashMap<>(); params.put("container", SingletonLaContainerFactory.getContainer()); params.put("executor", this); diff --git a/src/main/java/org/codelibs/fess/ldap/LdapManager.java b/src/main/java/org/codelibs/fess/ldap/LdapManager.java index 88310de33..dca9842f5 100644 --- a/src/main/java/org/codelibs/fess/ldap/LdapManager.java +++ b/src/main/java/org/codelibs/fess/ldap/LdapManager.java @@ -111,7 +111,7 @@ public class LdapManager { public String[] getRoles(final LdapUser ldapUser, final String bindDn, final String accountFilter) { final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); final FessConfig fessConfig = ComponentUtil.getFessConfig(); - final List roleList = new ArrayList(); + final List roleList = new ArrayList<>(); if (fessConfig.isLdapRoleSearchUserEnabled()) { roleList.add(systemHelper.getSearchRoleByUser(ldapUser.getName())); @@ -180,7 +180,7 @@ public class LdapManager { } protected void setAttributeValue(final List result, final String name, final Consumer consumer) { - List attrList = getAttributeValueList(result, name); + final List attrList = getAttributeValueList(result, name); if (!attrList.isEmpty()) { consumer.accept(attrList.get(0)); } @@ -206,7 +206,7 @@ public class LdapManager { return attrList; } return Collections.emptyList(); - } catch (NamingException e) { + } catch (final NamingException e) { throw new LdapOperationException("Failed to parse attribute values for " + name, e); } } @@ -843,7 +843,7 @@ public class LdapManager { } - public void apply(Group group) { + public void apply(final Group group) { final FessConfig fessConfig = ComponentUtil.getFessConfig(); if (!fessConfig.isLdapAdminEnabled()) { return; @@ -879,8 +879,8 @@ public class LdapManager { }); } - protected void modifyGroupAttributes(Group group, Supplier> adminEnv, String entryDN, - List result, FessConfig fessConfig) { + protected void modifyGroupAttributes(final Group group, final Supplier> adminEnv, final String entryDN, + final List result, final FessConfig fessConfig) { final List modifyList = new ArrayList<>(); final String attrGidNumber = fessConfig.getLdapAttrGidNumber(); 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 e96953fd9..67448f111 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java @@ -114,7 +114,7 @@ public interface FessProp { @SuppressWarnings("unchecked") Map map = (Map) propMap.get(DEFAULT_SORT_VALUES); if (map == null) { - String value = getSystemProperty(Constants.DEFAULT_SORT_VALUE_PROPERTY); + final String value = getSystemProperty(Constants.DEFAULT_SORT_VALUE_PROPERTY); if (StringUtil.isBlank(value)) { map = Collections.emptyMap(); } else { @@ -165,7 +165,7 @@ public interface FessProp { @SuppressWarnings("unchecked") Map map = (Map) propMap.get(DEFAULT_LABEL_VALUES); if (map == null) { - String value = getSystemProperty(Constants.DEFAULT_LABEL_VALUE_PROPERTY); + final String value = getSystemProperty(Constants.DEFAULT_LABEL_VALUE_PROPERTY); if (StringUtil.isBlank(value)) { map = Collections.emptyMap(); } else { @@ -645,9 +645,9 @@ public interface FessProp { if (values.length == 2) { final String[] subValues = values[1].split(":"); if (subValues.length == 2) { - return new Tuple3(values[0], subValues[0], subValues[1]); + return new Tuple3<>(values[0], subValues[0], subValues[1]); } else { - return new Tuple3(values[0], values[1], Constants.MAPPING_TYPE_ARRAY); + return new Tuple3<>(values[0], values[1], Constants.MAPPING_TYPE_ARRAY); } } return null; @@ -710,7 +710,7 @@ public interface FessProp { params = StreamUtil.of(getQueryLanguageMapping().split("\n")).filter(StringUtil::isNotBlank).map(v -> { final String[] values = v.split("="); if (values.length == 2) { - return new Pair(values[0], values[1]); + return new Pair<>(values[0], values[1]); } return null; }).collect(Collectors.toMap(Pair::getFirst, d -> d.getSecond())); @@ -854,14 +854,14 @@ public interface FessProp { return StreamUtil.of(getCrawlerFileProtocolsAsArray()).anyMatch(s -> url.startsWith(s)); } - public default void processSearchPreference(SearchRequestBuilder searchRequestBuilder, OptionalThing userBean) { + public default void processSearchPreference(final SearchRequestBuilder searchRequestBuilder, final OptionalThing userBean) { userBean.map(user -> { if (user.hasRoles(getAuthenticationAdminRolesAsArray())) { return Constants.SEARCH_PREFERENCE_PRIMARY; } return user.getUserId(); }).ifPresent(p -> searchRequestBuilder.setPreference(p)).orElse(() -> LaRequestUtil.getOptionalRequest().map(r -> { - HttpSession session = r.getSession(false); + final HttpSession session = r.getSession(false); if (session != null) { return session.getId(); } 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 bf75e20c8..65e278fa5 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 @@ -71,7 +71,7 @@ public class FessApiFailureHook implements ApiFailureHook { // #change_it for ha // Assist Logic // ============ protected JsonResponse asJson(final TooSimpleFailureBean bean) { - return new JsonResponse(bean); + return new JsonResponse<>(bean); } protected TooSimpleFailureBean createFailureBean(final ApiFailureResource resource) { 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 13fefe19f..d2d26d185 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 @@ -160,9 +160,9 @@ public class FessMultipartRequestHandler implements MultipartRequestHandler { // Handling Parts // ============== protected void prepareElementsHash() { - elementsText = new Hashtable(); - elementsFile = new Hashtable(); - elementsAll = new Hashtable(); + elementsText = new Hashtable<>(); + elementsFile = new Hashtable<>(); + elementsAll = new Hashtable<>(); } protected List parseRequest(final HttpServletRequest request, final ServletFileUpload upload) throws FileUploadException { diff --git a/src/main/java/org/codelibs/fess/screenshot/ScreenShotManager.java b/src/main/java/org/codelibs/fess/screenshot/ScreenShotManager.java index 7ae3fbf2d..c01b765a4 100644 --- a/src/main/java/org/codelibs/fess/screenshot/ScreenShotManager.java +++ b/src/main/java/org/codelibs/fess/screenshot/ScreenShotManager.java @@ -54,13 +54,13 @@ public class ScreenShotManager { public int screenShotPathCacheSize = 10; - private final List generatorList = new ArrayList(); + private final List generatorList = new ArrayList<>(); public String imageExtention = "png"; public int splitSize = 5; - private final BlockingQueue screenShotTaskQueue = new LinkedBlockingQueue(); + private final BlockingQueue screenShotTaskQueue = new LinkedBlockingQueue<>(); private boolean generating; @@ -141,7 +141,7 @@ public class ScreenShotManager { public void storeRequest(final String queryId, final List> documentItems) { final FessConfig fessConfig = ComponentUtil.getFessConfig(); - final Map dataMap = new HashMap(documentItems.size()); + final Map dataMap = new HashMap<>(documentItems.size()); for (final Map docMap : documentItems) { final String docid = (String) docMap.get(fessConfig.getIndexFieldDocId()); final String screenShotPath = getImageFilename(docMap); @@ -174,7 +174,7 @@ public class ScreenShotManager { Map> screenShotPathCache = (Map>) session.getAttribute(Constants.SCREEN_SHOT_PATH_CACHE); if (screenShotPathCache == null) { - screenShotPathCache = new LruHashMap>(screenShotPathCacheSize); + screenShotPathCache = new LruHashMap<>(screenShotPathCacheSize); session.setAttribute(Constants.SCREEN_SHOT_PATH_CACHE, screenShotPathCache); } return screenShotPathCache; diff --git a/src/main/java/org/codelibs/fess/screenshot/impl/BaseScreenShotGenerator.java b/src/main/java/org/codelibs/fess/screenshot/impl/BaseScreenShotGenerator.java index 2414c6674..dacfe0dcc 100644 --- a/src/main/java/org/codelibs/fess/screenshot/impl/BaseScreenShotGenerator.java +++ b/src/main/java/org/codelibs/fess/screenshot/impl/BaseScreenShotGenerator.java @@ -28,7 +28,7 @@ public abstract class BaseScreenShotGenerator implements ScreenShotGenerator { @Resource protected ServletContext application; - protected final Map conditionMap = new HashMap(); + protected final Map conditionMap = new HashMap<>(); public int directoryNameLength = 5; diff --git a/src/main/java/org/codelibs/fess/screenshot/impl/CommandGenerator.java b/src/main/java/org/codelibs/fess/screenshot/impl/CommandGenerator.java index 978e37a00..e9797768f 100644 --- a/src/main/java/org/codelibs/fess/screenshot/impl/CommandGenerator.java +++ b/src/main/java/org/codelibs/fess/screenshot/impl/CommandGenerator.java @@ -79,7 +79,7 @@ public class CommandGenerator extends BaseScreenShotGenerator { } final String outputPath = outputFile.getAbsolutePath(); - final List cmdList = new ArrayList(); + final List cmdList = new ArrayList<>(); for (final String value : commandList) { cmdList.add(value.replace("${url}", url).replace("${outputFile}", outputPath)); } diff --git a/src/main/java/org/codelibs/fess/util/ComponentUtil.java b/src/main/java/org/codelibs/fess/util/ComponentUtil.java index 2fe1b456d..1ea97a9d0 100644 --- a/src/main/java/org/codelibs/fess/util/ComponentUtil.java +++ b/src/main/java/org/codelibs/fess/util/ComponentUtil.java @@ -126,8 +126,6 @@ public final class ComponentUtil { private static final String SAMBA_HELPER = "sambaHelper"; - private static final String FTP_HELPER = "ftpHelper"; - private static final String VIEW_HELPER = "viewHelper"; private static final String SYSTEM_HELPER = "systemHelper"; @@ -341,7 +339,7 @@ public final class ComponentUtil { public static T getComponent(final Class clazz) { try { return SingletonLaContainer.getComponent(clazz); - } catch (NullPointerException e) { + } catch (final NullPointerException e) { throw new ContainerNotAvailableException(e); } } @@ -349,7 +347,7 @@ public final class ComponentUtil { public static T getComponent(final String componentName) { try { return SingletonLaContainer.getComponent(componentName); - } catch (NullPointerException e) { + } catch (final NullPointerException e) { throw new ContainerNotAvailableException(e); } } @@ -361,7 +359,7 @@ public final class ComponentUtil { public static boolean available() { try { return SingletonLaContainer.getComponent(SYSTEM_HELPER) != null; - } catch (Exception e) { + } catch (final Exception e) { // ignore } return false; diff --git a/src/main/java/org/codelibs/fess/util/DocList.java b/src/main/java/org/codelibs/fess/util/DocList.java index 0ebfa6551..9f179dde6 100644 --- a/src/main/java/org/codelibs/fess/util/DocList.java +++ b/src/main/java/org/codelibs/fess/util/DocList.java @@ -27,6 +27,7 @@ public class DocList extends ArrayList> { private long processingTime = 0; + @Override public void clear() { super.clear(); contentSize = 0; @@ -37,7 +38,7 @@ public class DocList extends ArrayList> { return contentSize; } - public void addContentSize(long contentSize) { + public void addContentSize(final long contentSize) { this.contentSize += contentSize; } @@ -45,7 +46,7 @@ public class DocList extends ArrayList> { return processingTime; } - public void addProcessingTime(long processingTime) { + public void addProcessingTime(final long processingTime) { this.processingTime += processingTime; } diff --git a/src/main/java/org/codelibs/fess/util/FacetResponse.java b/src/main/java/org/codelibs/fess/util/FacetResponse.java index 126f6861e..ad94948f0 100644 --- a/src/main/java/org/codelibs/fess/util/FacetResponse.java +++ b/src/main/java/org/codelibs/fess/util/FacetResponse.java @@ -30,9 +30,9 @@ import org.elasticsearch.search.aggregations.bucket.terms.Terms; import com.google.common.io.BaseEncoding; public class FacetResponse { - protected Map queryCountMap = new LinkedHashMap(); + protected Map queryCountMap = new LinkedHashMap<>(); - protected List fieldList = new ArrayList(); + protected List fieldList = new ArrayList<>(); public FacetResponse(final Aggregations aggregations) { aggregations diff --git a/src/main/java/org/codelibs/fess/util/InputStreamThread.java b/src/main/java/org/codelibs/fess/util/InputStreamThread.java index 52438e799..761d0ee5a 100644 --- a/src/main/java/org/codelibs/fess/util/InputStreamThread.java +++ b/src/main/java/org/codelibs/fess/util/InputStreamThread.java @@ -33,7 +33,7 @@ public class InputStreamThread extends Thread { private static final int MAX_BUFFER_SIZE = 1000; - private final List list = new LinkedList(); + private final List list = new LinkedList<>(); public InputStreamThread(final InputStream is, final String charset) { super("InputStreamThread"); diff --git a/src/main/java/org/codelibs/fess/util/MemoryUtil.java b/src/main/java/org/codelibs/fess/util/MemoryUtil.java index f97ae293a..7883b289a 100644 --- a/src/main/java/org/codelibs/fess/util/MemoryUtil.java +++ b/src/main/java/org/codelibs/fess/util/MemoryUtil.java @@ -32,7 +32,7 @@ public final class MemoryUtil { + byteCountToDisplaySize(maxBytes) + "}"; } - public static String byteCountToDisplaySize(long size) { + public static String byteCountToDisplaySize(final long size) { return FileUtils.byteCountToDisplaySize(size).replace(" ", StringUtil.EMPTY); } } diff --git a/src/main/java/org/codelibs/fess/util/OptionalUtil.java b/src/main/java/org/codelibs/fess/util/OptionalUtil.java index e9209eaf1..2bd45e1be 100644 --- a/src/main/java/org/codelibs/fess/util/OptionalUtil.java +++ b/src/main/java/org/codelibs/fess/util/OptionalUtil.java @@ -19,7 +19,7 @@ import org.dbflute.optional.OptionalEntity; public class OptionalUtil { - public static OptionalEntity ofNullable(T entity) { + public static OptionalEntity ofNullable(final T entity) { return OptionalEntity.ofNullable(entity, () -> {}); } diff --git a/src/main/java/org/codelibs/fess/util/ParameterUtil.java b/src/main/java/org/codelibs/fess/util/ParameterUtil.java index c29f721b3..e8a2e2aea 100644 --- a/src/main/java/org/codelibs/fess/util/ParameterUtil.java +++ b/src/main/java/org/codelibs/fess/util/ParameterUtil.java @@ -42,7 +42,7 @@ public class ParameterUtil { } public static Map parse(final String value) { - final Map paramMap = new HashMap(); + final Map paramMap = new HashMap<>(); if (value != null) { final String[] lines = value.split("[\r\n]"); for (final String line : lines) { diff --git a/src/main/java/org/codelibs/fess/util/QueryResponseList.java b/src/main/java/org/codelibs/fess/util/QueryResponseList.java index 210db5a00..47c44aa0e 100644 --- a/src/main/java/org/codelibs/fess/util/QueryResponseList.java +++ b/src/main/java/org/codelibs/fess/util/QueryResponseList.java @@ -74,7 +74,7 @@ public class QueryResponseList implements List> { protected long queryTime; public QueryResponseList() { - parent = new ArrayList>(); + parent = new ArrayList<>(); } // for testing @@ -96,7 +96,7 @@ public class QueryResponseList implements List> { final QueryHelper queryHelper = ComponentUtil.getQueryHelper(); final String hlPrefix = queryHelper.getHighlightPrefix(); for (final SearchHit searchHit : searchHits.getHits()) { - final Map docMap = new HashMap(); + final Map docMap = new HashMap<>(); if (searchHit.getSource() == null) { searchHit.getFields().forEach((key, value) -> { docMap.put(key, value.getValue()); @@ -170,7 +170,7 @@ public class QueryResponseList implements List> { if (endPageRangeSize > allPageCount) { endPageRangeSize = allPageCount; } - pageNumberList = new ArrayList(); + pageNumberList = new ArrayList<>(); for (int i = startPageRangeSize; i <= endPageRangeSize; i++) { pageNumberList.add(String.valueOf(i)); }