Bläddra i källkod

code clean-up

Shinsuke Sugaya 7 år sedan
förälder
incheckning
b4d8ca7385
25 ändrade filer med 74 tillägg och 77 borttagningar
  1. 2 2
      src/main/java/org/codelibs/fess/api/gsa/GsaApiManager.java
  2. 3 3
      src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
  3. 6 6
      src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java
  4. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java
  5. 3 3
      src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java
  6. 3 3
      src/main/java/org/codelibs/fess/ds/impl/JsonDataStoreImpl.java
  7. 7 10
      src/main/java/org/codelibs/fess/es/client/FessEsClient.java
  8. 2 2
      src/main/java/org/codelibs/fess/es/config/exbhv/ScheduledJobBhv.java
  9. 3 3
      src/main/java/org/codelibs/fess/es/log/exbhv/SearchLogBhv.java
  10. 1 1
      src/main/java/org/codelibs/fess/exception/JobNotFoundException.java
  11. 1 1
      src/main/java/org/codelibs/fess/exception/JobProcessingException.java
  12. 2 2
      src/main/java/org/codelibs/fess/exec/Crawler.java
  13. 1 1
      src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java
  14. 1 1
      src/main/java/org/codelibs/fess/helper/ActivityHelper.java
  15. 5 5
      src/main/java/org/codelibs/fess/helper/ProcessHelper.java
  16. 1 1
      src/main/java/org/codelibs/fess/helper/QueryHelper.java
  17. 3 3
      src/main/java/org/codelibs/fess/helper/RelatedContentHelper.java
  18. 1 1
      src/main/java/org/codelibs/fess/helper/SystemHelper.java
  19. 1 1
      src/main/java/org/codelibs/fess/helper/ViewHelper.java
  20. 1 1
      src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
  21. 3 3
      src/main/java/org/codelibs/fess/score/GoogleAnalyticsScoreBooster.java
  22. 2 2
      src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java
  23. 17 17
      src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java
  24. 1 1
      src/main/java/org/codelibs/fess/util/DocumentUtil.java
  25. 3 3
      src/main/java/org/codelibs/fess/util/ThreadDumpUtil.java

+ 2 - 2
src/main/java/org/codelibs/fess/api/gsa/GsaApiManager.java

@@ -526,11 +526,11 @@ public class GsaApiManager extends BaseApiManager implements WebApiManager {
         this.gsaMetaPrefix = gsaMetaPrefix;
         this.gsaMetaPrefix = gsaMetaPrefix;
     }
     }
 
 
-    public void setCharsetField(String charsetField) {
+    public void setCharsetField(final String charsetField) {
         this.charsetField = charsetField;
         this.charsetField = charsetField;
     }
     }
 
 
-    public void setContentTypeField(String contentTypeField) {
+    public void setContentTypeField(final String contentTypeField) {
         this.contentTypeField = contentTypeField;
         this.contentTypeField = contentTypeField;
     }
     }
 }
 }

+ 3 - 3
src/main/java/org/codelibs/fess/api/json/JsonApiManager.java

@@ -161,7 +161,7 @@ public class JsonApiManager extends BaseJsonApiManager {
                         buf.append('\n');
                         buf.append('\n');
                         try {
                         try {
                             response.getWriter().print(buf.toString());
                             response.getWriter().print(buf.toString());
-                        } catch (IOException e) {
+                        } catch (final IOException e) {
                             throw new IORuntimeException(e);
                             throw new IORuntimeException(e);
                         }
                         }
                         return true;
                         return true;
@@ -170,8 +170,8 @@ public class JsonApiManager extends BaseJsonApiManager {
             if (logger.isDebugEnabled()) {
             if (logger.isDebugEnabled()) {
                 logger.debug("Loaded " + count + " docs");
                 logger.debug("Loaded " + count + " docs");
             }
             }
-        } catch (Exception e) {
-            int status = 9;
+        } catch (final Exception e) {
+            final int status = 9;
             if (logger.isDebugEnabled()) {
             if (logger.isDebugEnabled()) {
                 logger.debug("Failed to process a ping request.", e);
                 logger.debug("Failed to process a ping request.", e);
             }
             }

+ 6 - 6
src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java

@@ -189,7 +189,7 @@ public class AdminBackupAction extends FessAdminAction {
                 });
                 });
     }
     }
 
 
-    private static StringBuilder appendJson(String field, Object value, StringBuilder buf) {
+    private static StringBuilder appendJson(final String field, final Object value, final StringBuilder buf) {
         buf.append('"').append(StringEscapeUtils.escapeJson(field)).append('"').append(':');
         buf.append('"').append(StringEscapeUtils.escapeJson(field)).append('"').append(':');
         if (value == null) {
         if (value == null) {
             buf.append("null");
             buf.append("null");
@@ -210,7 +210,7 @@ public class AdminBackupAction extends FessAdminAction {
         } else if (value instanceof Map) {
         } else if (value instanceof Map) {
             buf.append('{');
             buf.append('{');
             final String json = ((Map<?, ?>) value).entrySet().stream().map(e -> {
             final String json = ((Map<?, ?>) value).entrySet().stream().map(e -> {
-                StringBuilder tempBuf = new StringBuilder();
+                final StringBuilder tempBuf = new StringBuilder();
                 appendJson(e.getKey().toString(), e.getValue(), tempBuf);
                 appendJson(e.getKey().toString(), e.getValue(), tempBuf);
                 return tempBuf.toString();
                 return tempBuf.toString();
             }).collect(Collectors.joining(","));
             }).collect(Collectors.joining(","));
@@ -235,7 +235,7 @@ public class AdminBackupAction extends FessAdminAction {
                         cb.query().addOrderBy_RequestedAt_Asc();
                         cb.query().addOrderBy_RequestedAt_Asc();
                     },
                     },
                     entity -> {
                     entity -> {
-                        StringBuilder buf = new StringBuilder();
+                        final StringBuilder buf = new StringBuilder();
                         buf.append('{');
                         buf.append('{');
                         appendJson("id", entity.getId(), buf).append(',');
                         appendJson("id", entity.getId(), buf).append(',');
                         appendJson("query-id", entity.getQueryId(), buf).append(',');
                         appendJson("query-id", entity.getQueryId(), buf).append(',');
@@ -280,7 +280,7 @@ public class AdminBackupAction extends FessAdminAction {
                 cb.query().matchAll();
                 cb.query().matchAll();
                 cb.query().addOrderBy_CreatedAt_Asc();
                 cb.query().addOrderBy_CreatedAt_Asc();
             }, entity -> {
             }, entity -> {
-                StringBuilder buf = new StringBuilder();
+                final StringBuilder buf = new StringBuilder();
                 buf.append('{');
                 buf.append('{');
                 appendJson("id", entity.getId(), buf).append(',');
                 appendJson("id", entity.getId(), buf).append(',');
                 appendJson("created-at", entity.getCreatedAt(), buf).append(',');
                 appendJson("created-at", entity.getCreatedAt(), buf).append(',');
@@ -303,7 +303,7 @@ public class AdminBackupAction extends FessAdminAction {
                 cb.query().matchAll();
                 cb.query().matchAll();
                 cb.query().addOrderBy_CreatedAt_Asc();
                 cb.query().addOrderBy_CreatedAt_Asc();
             }, entity -> {
             }, entity -> {
-                StringBuilder buf = new StringBuilder();
+                final StringBuilder buf = new StringBuilder();
                 buf.append('{');
                 buf.append('{');
                 appendJson("id", entity.getId(), buf).append(',');
                 appendJson("id", entity.getId(), buf).append(',');
                 appendJson("created-at", entity.getCreatedAt(), buf).append(',');
                 appendJson("created-at", entity.getCreatedAt(), buf).append(',');
@@ -329,7 +329,7 @@ public class AdminBackupAction extends FessAdminAction {
                 cb.query().matchAll();
                 cb.query().matchAll();
                 cb.query().addOrderBy_RequestedAt_Asc();
                 cb.query().addOrderBy_RequestedAt_Asc();
             }, entity -> {
             }, entity -> {
-                StringBuilder buf = new StringBuilder();
+                final StringBuilder buf = new StringBuilder();
                 buf.append('{');
                 buf.append('{');
                 appendJson("id", entity.getId(), buf).append(',');
                 appendJson("id", entity.getId(), buf).append(',');
                 appendJson("query-id", entity.getQueryId(), buf).append(',');
                 appendJson("query-id", entity.getQueryId(), buf).append(',');

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java

@@ -148,7 +148,7 @@ public class AdminCrawlinginfoAction extends FessAdminAction {
             try {
             try {
                 processHelper.sendCommand(entity.getSessionId(), Constants.CRAWLER_PROCESS_COMMAND_THREAD_DUMP);
                 processHelper.sendCommand(entity.getSessionId(), Constants.CRAWLER_PROCESS_COMMAND_THREAD_DUMP);
                 saveInfo(messages -> messages.addSuccessPrintThreadDump(GLOBAL));
                 saveInfo(messages -> messages.addSuccessPrintThreadDump(GLOBAL));
-            } catch (Exception e) {
+            } catch (final Exception e) {
                 logger.warn("Failed to print a thread dump.", e);
                 logger.warn("Failed to print a thread dump.", e);
                 throwValidationError(messages -> messages.addErrorsFailedToPrintThreadDump(GLOBAL), () -> asListHtml());
                 throwValidationError(messages -> messages.addErrorsFailedToPrintThreadDump(GLOBAL), () -> asListHtml());
             }
             }

+ 3 - 3
src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java

@@ -192,8 +192,8 @@ public class FessXpathTransformer extends XpathTransformer implements FessTransf
         resultData.setEncoding(charsetName);
         resultData.setEncoding(charsetName);
     }
     }
 
 
-    protected void normalizeData(final ResponseData responseData, Map<String, Object> dataMap) {
-        Object titleObj = dataMap.get(fessConfig.getIndexFieldTitle());
+    protected void normalizeData(final ResponseData responseData, final Map<String, Object> dataMap) {
+        final Object titleObj = dataMap.get(fessConfig.getIndexFieldTitle());
         if (titleObj != null) {
         if (titleObj != null) {
             dataMap.put(fessConfig.getIndexFieldTitle(),
             dataMap.put(fessConfig.getIndexFieldTitle(),
                     ComponentUtil.getDocumentHelper().getTitle(responseData, titleObj.toString(), dataMap));
                     ComponentUtil.getDocumentHelper().getTitle(responseData, titleObj.toString(), dataMap));
@@ -254,7 +254,7 @@ public class FessXpathTransformer extends XpathTransformer implements FessTransf
 
 
     protected void processXRobotsTag(final ResponseData responseData, final ResultData resultData) {
     protected void processXRobotsTag(final ResponseData responseData, final ResultData resultData) {
         final Map<String, String> configMap = getConfigPrameterMap(responseData, ConfigName.CONFIG);
         final Map<String, String> configMap = getConfigPrameterMap(responseData, ConfigName.CONFIG);
-        String ignore = configMap.get(IGNORE_ROBOTS_TAGS);
+        final String ignore = configMap.get(IGNORE_ROBOTS_TAGS);
         if (ignore == null) {
         if (ignore == null) {
             if (fessConfig.isCrawlerIgnoreRobotsTags()) {
             if (fessConfig.isCrawlerIgnoreRobotsTags()) {
                 return;
                 return;

+ 3 - 3
src/main/java/org/codelibs/fess/ds/impl/JsonDataStoreImpl.java

@@ -50,7 +50,7 @@ public class JsonDataStoreImpl extends AbstractDataStoreImpl {
 
 
     private static final String DIRS_PARAM = "directories";
     private static final String DIRS_PARAM = "directories";
 
 
-    private String[] fileSuffixes = new String[] { ".json", ".jsonl" };
+    private final String[] fileSuffixes = new String[] { ".json", ".jsonl" };
 
 
     @Override
     @Override
     protected void storeData(final DataConfig dataConfig, final IndexUpdateCallback callback, final Map<String, String> paramMap,
     protected void storeData(final DataConfig dataConfig, final IndexUpdateCallback callback, final Map<String, String> paramMap,
@@ -148,9 +148,9 @@ public class JsonDataStoreImpl extends AbstractDataStoreImpl {
 
 
                 callback.store(paramMap, dataMap);
                 callback.store(paramMap, dataMap);
             }
             }
-        } catch (FileNotFoundException e) {
+        } catch (final FileNotFoundException e) {
             logger.error("Source file " + file + " does not exist.");
             logger.error("Source file " + file + " does not exist.");
-        } catch (IOException e) {
+        } catch (final IOException e) {
             logger.error("IO Error occurred while reading source file.");
             logger.error("IO Error occurred while reading source file.");
         }
         }
     }
     }

+ 7 - 10
src/main/java/org/codelibs/fess/es/client/FessEsClient.java

@@ -285,15 +285,12 @@ public class FessEsClient implements Client {
         if (StringUtil.isBlank(transportAddressesValue)) {
         if (StringUtil.isBlank(transportAddressesValue)) {
             final StringBuilder buf = new StringBuilder();
             final StringBuilder buf = new StringBuilder();
             for (final TransportAddress transportAddress : transportAddressList) {
             for (final TransportAddress transportAddress : transportAddressList) {
-                if (transportAddress instanceof TransportAddress) {
-                    if (buf.length() > 0) {
-                        buf.append(',');
-                    }
-                    final TransportAddress inetTransportAddress = (TransportAddress) transportAddress;
-                    buf.append(inetTransportAddress.address().getHostName());
-                    buf.append(':');
-                    buf.append(inetTransportAddress.address().getPort());
+                if (buf.length() > 0) {
+                    buf.append(',');
                 }
                 }
+                buf.append(transportAddress.address().getHostName());
+                buf.append(':');
+                buf.append(transportAddress.address().getPort());
             }
             }
             if (buf.length() > 0) {
             if (buf.length() > 0) {
                 System.setProperty(Constants.FESS_ES_TRANSPORT_ADDRESSES, buf.toString());
                 System.setProperty(Constants.FESS_ES_TRANSPORT_ADDRESSES, buf.toString());
@@ -599,7 +596,7 @@ public class FessEsClient implements Client {
             if (logger.isDebugEnabled()) {
             if (logger.isDebugEnabled()) {
                 logger.debug("Elasticsearch Cluster Status: " + response.getStatus());
                 logger.debug("Elasticsearch Cluster Status: " + response.getStatus());
             }
             }
-        } catch (Exception e) {
+        } catch (final Exception e) {
             final String message =
             final String message =
                     "Elasticsearch (" + System.getProperty(Constants.FESS_ES_TRANSPORT_ADDRESSES)
                     "Elasticsearch (" + System.getProperty(Constants.FESS_ES_TRANSPORT_ADDRESSES)
                             + ") is not available. Check the state of your Elasticsearch cluster ("
                             + ") is not available. Check the state of your Elasticsearch cluster ("
@@ -1437,7 +1434,7 @@ public class FessEsClient implements Client {
         this.scrollForDelete = scrollForDelete;
         this.scrollForDelete = scrollForDelete;
     }
     }
 
 
-    public void setScrollForSearch(String scrollForSearch) {
+    public void setScrollForSearch(final String scrollForSearch) {
         this.scrollForSearch = scrollForSearch;
         this.scrollForSearch = scrollForSearch;
     }
     }
 
 

+ 2 - 2
src/main/java/org/codelibs/fess/es/config/exbhv/ScheduledJobBhv.java

@@ -49,14 +49,14 @@ public class ScheduledJobBhv extends BsScheduledJobBhv {
         for (int i = 0; i < 30; i++) {
         for (int i = 0; i < 30; i++) {
             try {
             try {
                 return super.selectByPK(id);
                 return super.selectByPK(id);
-            } catch (Exception e) {
+            } catch (final Exception e) {
                 if (logger.isDebugEnabled()) {
                 if (logger.isDebugEnabled()) {
                     logger.debug("Failed to select a job by " + id, e);
                     logger.debug("Failed to select a job by " + id, e);
                 }
                 }
                 lastException = e;
                 lastException = e;
                 try {
                 try {
                     Thread.sleep(RandomUtils.nextLong(500, 5000));
                     Thread.sleep(RandomUtils.nextLong(500, 5000));
-                } catch (InterruptedException e1) {
+                } catch (final InterruptedException e1) {
                     // ignore
                     // ignore
                 }
                 }
             }
             }

+ 3 - 3
src/main/java/org/codelibs/fess/es/log/exbhv/SearchLogBhv.java

@@ -73,12 +73,12 @@ public class SearchLogBhv extends BsSearchLogBhv {
             if (searchFieldObj instanceof Map) {
             if (searchFieldObj instanceof Map) {
                 ((Map<String, ?>) searchFieldObj).entrySet().stream().forEach(e -> {
                 ((Map<String, ?>) searchFieldObj).entrySet().stream().forEach(e -> {
                     if (e.getValue() instanceof String[]) {
                     if (e.getValue() instanceof String[]) {
-                        String[] values = (String[]) e.getValue();
+                        final String[] values = (String[]) e.getValue();
                         for (final String v : values) {
                         for (final String v : values) {
                             result.getSearchFieldLogList().add(new Pair<>(e.getKey(), v));
                             result.getSearchFieldLogList().add(new Pair<>(e.getKey(), v));
                         }
                         }
                     } else if (e.getValue() instanceof List) {
                     } else if (e.getValue() instanceof List) {
-                        List<String> values = (List<String>) e.getValue();
+                        final List<String> values = (List<String>) e.getValue();
                         for (final String v : values) {
                         for (final String v : values) {
                             result.getSearchFieldLogList().add(new Pair<>(e.getKey(), v));
                             result.getSearchFieldLogList().add(new Pair<>(e.getKey(), v));
                         }
                         }
@@ -88,7 +88,7 @@ public class SearchLogBhv extends BsSearchLogBhv {
                 });
                 });
             }
             }
             return result;
             return result;
-        } catch (Exception e) {
+        } catch (final Exception e) {
             final String msg = "Cannot create a new instance: " + entityType.getName();
             final String msg = "Cannot create a new instance: " + entityType.getName();
             throw new IllegalBehaviorStateException(msg, e);
             throw new IllegalBehaviorStateException(msg, e);
         }
         }

+ 1 - 1
src/main/java/org/codelibs/fess/exception/JobNotFoundException.java

@@ -25,7 +25,7 @@ public class JobNotFoundException extends FessSystemException {
         super(scheduledJob.toString());
         super(scheduledJob.toString());
     }
     }
 
 
-    public JobNotFoundException(String message) {
+    public JobNotFoundException(final String message) {
         super(message);
         super(message);
     }
     }
 
 

+ 1 - 1
src/main/java/org/codelibs/fess/exception/JobProcessingException.java

@@ -25,7 +25,7 @@ public class JobProcessingException extends FessSystemException {
         super(e);
         super(e);
     }
     }
 
 
-    public JobProcessingException(String message, IOException e) {
+    public JobProcessingException(final String message, final IOException e) {
         super(message, e);
         super(message, e);
     }
     }
 
 

+ 2 - 2
src/main/java/org/codelibs/fess/exec/Crawler.java

@@ -251,11 +251,11 @@ public class Crawler {
                             if (Thread.interrupted()) {
                             if (Thread.interrupted()) {
                                 return;
                                 return;
                             }
                             }
-                        } catch (InterruptedException e) {
+                        } catch (final InterruptedException e) {
                             return;
                             return;
                         }
                         }
                     }
                     }
-                } catch (IOException e) {
+                } catch (final IOException e) {
                     logger.debug("I/O exception.", e);
                     logger.debug("I/O exception.", e);
                 }
                 }
             }, "ProcessCommand");
             }, "ProcessCommand");

+ 1 - 1
src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java

@@ -139,7 +139,7 @@ public class ThumbnailGenerator {
                     TimeoutManager.getInstance().addTimeoutTarget(new SystemMonitorTarget(),
                     TimeoutManager.getInstance().addTimeoutTarget(new SystemMonitorTarget(),
                             ComponentUtil.getFessConfig().getSuggestSystemMonitorIntervalAsInteger(), true);
                             ComponentUtil.getFessConfig().getSuggestSystemMonitorIntervalAsInteger(), true);
 
 
-            int totalCount = process(options);
+            final int totalCount = process(options);
             if (totalCount != 0) {
             if (totalCount != 0) {
                 logger.info("Created " + totalCount + " thumbnail files.");
                 logger.info("Created " + totalCount + " thumbnail files.");
             } else {
             } else {

+ 1 - 1
src/main/java/org/codelibs/fess/helper/ActivityHelper.java

@@ -144,7 +144,7 @@ public class ActivityHelper {
         this.loggerName = loggerName;
         this.loggerName = loggerName;
     }
     }
 
 
-    public void setPermissionSeparator(String permissionSeparator) {
+    public void setPermissionSeparator(final String permissionSeparator) {
         this.permissionSeparator = permissionSeparator;
         this.permissionSeparator = permissionSeparator;
     }
     }
 }
 }

+ 5 - 5
src/main/java/org/codelibs/fess/helper/ProcessHelper.java

@@ -80,8 +80,8 @@ public class ProcessHelper {
         return !runningProcessMap.isEmpty();
         return !runningProcessMap.isEmpty();
     }
     }
 
 
-    public boolean isProcessRunning(String sessionId) {
-        JobProcess jobProcess = runningProcessMap.get(sessionId);
+    public boolean isProcessRunning(final String sessionId) {
+        final JobProcess jobProcess = runningProcessMap.get(sessionId);
         return jobProcess != null && jobProcess.getProcess().isAlive();
         return jobProcess != null && jobProcess.getProcess().isAlive();
     }
     }
 
 
@@ -147,14 +147,14 @@ public class ProcessHelper {
         this.processDestroyTimeout = processDestroyTimeout;
         this.processDestroyTimeout = processDestroyTimeout;
     }
     }
 
 
-    public void sendCommand(String sessionId, String command) {
-        JobProcess jobProcess = runningProcessMap.get(sessionId);
+    public void sendCommand(final String sessionId, final String command) {
+        final JobProcess jobProcess = runningProcessMap.get(sessionId);
         if (jobProcess != null) {
         if (jobProcess != null) {
             try {
             try {
                 final OutputStream out = jobProcess.getProcess().getOutputStream();
                 final OutputStream out = jobProcess.getProcess().getOutputStream();
                 IOUtils.write(command + "\n", out, Constants.CHARSET_UTF_8);
                 IOUtils.write(command + "\n", out, Constants.CHARSET_UTF_8);
                 out.flush();
                 out.flush();
-            } catch (IOException e) {
+            } catch (final IOException e) {
                 throw new JobProcessingException(e);
                 throw new JobProcessingException(e);
             }
             }
         } else {
         } else {

+ 1 - 1
src/main/java/org/codelibs/fess/helper/QueryHelper.java

@@ -518,7 +518,7 @@ public class QueryHelper {
             return QueryBuilders.matchPhraseQuery(f, text);
             return QueryBuilders.matchPhraseQuery(f, text);
         }
         }
 
 
-        UnicodeBlock block = UnicodeBlock.of(text.codePointAt(0));
+        final UnicodeBlock block = UnicodeBlock.of(text.codePointAt(0));
         if (block == UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS //
         if (block == UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS //
                 || block == UnicodeBlock.HIRAGANA //
                 || block == UnicodeBlock.HIRAGANA //
                 || block == UnicodeBlock.KATAKANA //
                 || block == UnicodeBlock.KATAKANA //

+ 3 - 3
src/main/java/org/codelibs/fess/helper/RelatedContentHelper.java

@@ -72,7 +72,7 @@ public class RelatedContentHelper {
                 relatedContentMap.put(key, pair);
                 relatedContentMap.put(key, pair);
             }
             }
             if (entity.getTerm().startsWith(regexPrefix)) {
             if (entity.getTerm().startsWith(regexPrefix)) {
-                String regex = entity.getTerm().substring(regexPrefix.length());
+                final String regex = entity.getTerm().substring(regexPrefix.length());
                 if (StringUtil.isBlank(regex)) {
                 if (StringUtil.isBlank(regex)) {
                     logger.warn("Unknown regex pattern: " + entity.getTerm());
                     logger.warn("Unknown regex pattern: " + entity.getTerm());
                 } else {
                 } else {
@@ -114,11 +114,11 @@ public class RelatedContentHelper {
         return term != null ? term.toLowerCase(Locale.ROOT) : term;
         return term != null ? term.toLowerCase(Locale.ROOT) : term;
     }
     }
 
 
-    public void setRegexPrefix(String regexPrefix) {
+    public void setRegexPrefix(final String regexPrefix) {
         this.regexPrefix = regexPrefix;
         this.regexPrefix = regexPrefix;
     }
     }
 
 
-    public void setQueryPlaceHolder(String queryPlaceHolder) {
+    public void setQueryPlaceHolder(final String queryPlaceHolder) {
         this.queryPlaceHolder = queryPlaceHolder;
         this.queryPlaceHolder = queryPlaceHolder;
     }
     }
 
 

+ 1 - 1
src/main/java/org/codelibs/fess/helper/SystemHelper.java

@@ -259,7 +259,7 @@ public class SystemHelper {
     }
     }
 
 
     public String normalizeHtmlLang(final String value) {
     public String normalizeHtmlLang(final String value) {
-        String defaultLang = ComponentUtil.getFessConfig().getCrawlerDocumentHtmlDefaultLang();
+        final String defaultLang = ComponentUtil.getFessConfig().getCrawlerDocumentHtmlDefaultLang();
         if (StringUtil.isNotBlank(defaultLang)) {
         if (StringUtil.isNotBlank(defaultLang)) {
             return defaultLang;
             return defaultLang;
         }
         }

+ 1 - 1
src/main/java/org/codelibs/fess/helper/ViewHelper.java

@@ -236,7 +236,7 @@ public class ViewHelper {
                 // file
                 // file
                 try {
                 try {
                     url = URLDecoder.decode(url.replace("+", "%2B"), urlLinkEncoding);
                     url = URLDecoder.decode(url.replace("+", "%2B"), urlLinkEncoding);
-                } catch (Exception e) {
+                } catch (final Exception e) {
                     if (logger.isDebugEnabled()) {
                     if (logger.isDebugEnabled()) {
                         logger.warn("Failed to decode " + url, e);
                         logger.warn("Failed to decode " + url, e);
                     }
                     }

+ 1 - 1
src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java

@@ -587,7 +587,7 @@ public class FessLabels extends UserMessages {
     /** The key of the message: MENU */
     /** The key of the message: MENU */
     public static final String LABELS_SIDEBAR_MENU = "{labels.sidebar.menu}";
     public static final String LABELS_SIDEBAR_MENU = "{labels.sidebar.menu}";
 
 
-    /** The key of the message: &copy;2017 &lt;a href="https://github.com/codelibs"&gt;CodeLibs Project&lt;/a&gt;. */
+    /** The key of the message: &copy;2018 &lt;a href="https://github.com/codelibs"&gt;CodeLibs Project&lt;/a&gt;. */
     public static final String LABELS_FOOTER_COPYRIGHT = "{labels.footer.copyright}";
     public static final String LABELS_FOOTER_COPYRIGHT = "{labels.footer.copyright}";
 
 
     /** The key of the message: Search */
     /** The key of the message: Search */

+ 3 - 3
src/main/java/org/codelibs/fess/score/GoogleAnalyticsScoreBooster.java

@@ -178,7 +178,7 @@ public class GoogleAnalyticsScoreBooster extends ScoreBooster {
         return counter;
         return counter;
     }
     }
 
 
-    protected String normalizeUrl(String path, final String baseUrl) throws MalformedURLException {
+    protected String normalizeUrl(final String path, final String baseUrl) throws MalformedURLException {
         return new URL(baseUrl + path.toString()).toString();
         return new URL(baseUrl + path.toString()).toString();
     }
     }
 
 
@@ -194,10 +194,10 @@ public class GoogleAnalyticsScoreBooster extends ScoreBooster {
     }
     }
 
 
     public void addReportRequest(final List<String> urls, final ReportRequest request) {
     public void addReportRequest(final List<String> urls, final ReportRequest request) {
-        reportRequesList.add(new Pair<String[], ReportRequest>(urls.toArray(new String[urls.size()]), request));
+        reportRequesList.add(new Pair<>(urls.toArray(new String[urls.size()]), request));
     }
     }
 
 
     public void addReportRequest(final String url, final ReportRequest request) {
     public void addReportRequest(final String url, final ReportRequest request) {
-        reportRequesList.add(new Pair<String[], ReportRequest>(new String[] { url }, request));
+        reportRequesList.add(new Pair<>(new String[] { url }, request));
     }
     }
 }
 }

+ 2 - 2
src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java

@@ -175,7 +175,7 @@ public class CommandGenerator extends BaseThumbnailGenerator {
 
 
         private final List<String> commandList;
         private final List<String> commandList;
 
 
-        private long timeout;
+        private final long timeout;
 
 
         protected ProcessDestroyer(final Process p, final List<String> commandList, final long timeout) {
         protected ProcessDestroyer(final Process p, final List<String> commandList, final long timeout) {
             this.p = p;
             this.p = p;
@@ -206,7 +206,7 @@ public class CommandGenerator extends BaseThumbnailGenerator {
         this.baseDir = baseDir;
         this.baseDir = baseDir;
     }
     }
 
 
-    public void setCommandDestroyTimeout(long commandDestroyTimeout) {
+    public void setCommandDestroyTimeout(final long commandDestroyTimeout) {
         this.commandDestroyTimeout = commandDestroyTimeout;
         this.commandDestroyTimeout = commandDestroyTimeout;
     }
     }
 
 

+ 17 - 17
src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java

@@ -68,7 +68,7 @@ public class SystemMonitorTarget implements TimeoutTarget {
 
 
     @Override
     @Override
     public void expired() {
     public void expired() {
-        StringBuilder buf = new StringBuilder(1000);
+        final StringBuilder buf = new StringBuilder(1000);
 
 
         buf.append("[SYSTEM MONITOR] ");
         buf.append("[SYSTEM MONITOR] ");
         buf.append('{');
         buf.append('{');
@@ -84,10 +84,10 @@ public class SystemMonitorTarget implements TimeoutTarget {
         logger.info(buf.toString());
         logger.info(buf.toString());
     }
     }
 
 
-    private void appendJvmStats(StringBuilder buf) {
+    private void appendJvmStats(final StringBuilder buf) {
         buf.append("\"jvm\":{");
         buf.append("\"jvm\":{");
         final JvmStats jvmStats = JvmStats.jvmStats();
         final JvmStats jvmStats = JvmStats.jvmStats();
-        Mem mem = jvmStats.getMem();
+        final Mem mem = jvmStats.getMem();
         buf.append("\"memory\":{");
         buf.append("\"memory\":{");
         buf.append("\"heap\":{");
         buf.append("\"heap\":{");
         append(buf, "used", () -> mem.getHeapUsed().bytesAsInt()).append(',');
         append(buf, "used", () -> mem.getHeapUsed().bytesAsInt()).append(',');
@@ -100,10 +100,10 @@ public class SystemMonitorTarget implements TimeoutTarget {
         append(buf, "committed", () -> mem.getNonHeapCommitted().bytesAsInt());
         append(buf, "committed", () -> mem.getNonHeapCommitted().bytesAsInt());
         buf.append('}');
         buf.append('}');
         buf.append("},");
         buf.append("},");
-        List<BufferPool> bufferPools = jvmStats.getBufferPools();
+        final List<BufferPool> bufferPools = jvmStats.getBufferPools();
         buf.append("\"pools\":{");
         buf.append("\"pools\":{");
         buf.append(bufferPools.stream().map(p -> {
         buf.append(bufferPools.stream().map(p -> {
-            StringBuilder b = new StringBuilder();
+            final StringBuilder b = new StringBuilder();
             b.append('"').append(StringEscapeUtils.escapeJson(p.getName())).append("\":{");
             b.append('"').append(StringEscapeUtils.escapeJson(p.getName())).append("\":{");
             append(b, "count", () -> p.getCount()).append(',');
             append(b, "count", () -> p.getCount()).append(',');
             append(b, "used", () -> p.getUsed().bytesAsInt()).append(',');
             append(b, "used", () -> p.getUsed().bytesAsInt()).append(',');
@@ -111,22 +111,22 @@ public class SystemMonitorTarget implements TimeoutTarget {
             return b.toString();
             return b.toString();
         }).collect(Collectors.joining(",")));
         }).collect(Collectors.joining(",")));
         buf.append("},");
         buf.append("},");
-        GarbageCollectors gc = jvmStats.getGc();
+        final GarbageCollectors gc = jvmStats.getGc();
         buf.append("\"gc\":{");
         buf.append("\"gc\":{");
         buf.append(Arrays.stream(gc.getCollectors()).map(c -> {
         buf.append(Arrays.stream(gc.getCollectors()).map(c -> {
-            StringBuilder b = new StringBuilder();
+            final StringBuilder b = new StringBuilder();
             b.append('"').append(StringEscapeUtils.escapeJson(c.getName())).append("\":{");
             b.append('"').append(StringEscapeUtils.escapeJson(c.getName())).append("\":{");
             append(b, "count", () -> c.getCollectionCount()).append(',');
             append(b, "count", () -> c.getCollectionCount()).append(',');
             append(b, "time", () -> c.getCollectionTime().getMillis()).append('}');
             append(b, "time", () -> c.getCollectionTime().getMillis()).append('}');
             return b.toString();
             return b.toString();
         }).collect(Collectors.joining(",")));
         }).collect(Collectors.joining(",")));
         buf.append("},");
         buf.append("},");
-        Threads threads = jvmStats.getThreads();
+        final Threads threads = jvmStats.getThreads();
         buf.append("\"threads\":{");
         buf.append("\"threads\":{");
         append(buf, "count", () -> threads.getCount()).append(',');
         append(buf, "count", () -> threads.getCount()).append(',');
         append(buf, "peak", () -> threads.getPeakCount());
         append(buf, "peak", () -> threads.getPeakCount());
         buf.append("},");
         buf.append("},");
-        Classes classes = jvmStats.getClasses();
+        final Classes classes = jvmStats.getClasses();
         buf.append("\"classes\":{");
         buf.append("\"classes\":{");
         append(buf, "loaded", () -> classes.getLoadedClassCount()).append(',');
         append(buf, "loaded", () -> classes.getLoadedClassCount()).append(',');
         append(buf, "total_loaded", () -> classes.getTotalLoadedClassCount()).append(',');
         append(buf, "total_loaded", () -> classes.getTotalLoadedClassCount()).append(',');
@@ -136,7 +136,7 @@ public class SystemMonitorTarget implements TimeoutTarget {
         buf.append("},");
         buf.append("},");
     }
     }
 
 
-    private void appendProcessStats(StringBuilder buf) {
+    private void appendProcessStats(final StringBuilder buf) {
         buf.append("\"process\":{");
         buf.append("\"process\":{");
         final ProcessProbe processProbe = ProcessProbe.getInstance();
         final ProcessProbe processProbe = ProcessProbe.getInstance();
         buf.append("\"file_descriptor\":{");
         buf.append("\"file_descriptor\":{");
@@ -153,7 +153,7 @@ public class SystemMonitorTarget implements TimeoutTarget {
         buf.append("},");
         buf.append("},");
     }
     }
 
 
-    private void appendOsStats(StringBuilder buf) {
+    private void appendOsStats(final StringBuilder buf) {
         buf.append("\"os\":{");
         buf.append("\"os\":{");
         final OsProbe osProbe = OsProbe.getInstance();
         final OsProbe osProbe = OsProbe.getInstance();
         buf.append("\"memory\":{");
         buf.append("\"memory\":{");
@@ -168,26 +168,26 @@ public class SystemMonitorTarget implements TimeoutTarget {
         buf.append("},");
         buf.append("},");
         buf.append("\"cpu\":{");
         buf.append("\"cpu\":{");
         append(buf, "percent", () -> osProbe.getSystemCpuPercent());
         append(buf, "percent", () -> osProbe.getSystemCpuPercent());
-        OsStats osStats = osProbe.osStats();
+        final OsStats osStats = osProbe.osStats();
         buf.append("},");
         buf.append("},");
         append(buf, "load_averages", () -> osStats.getCpu().getLoadAverage());
         append(buf, "load_averages", () -> osStats.getCpu().getLoadAverage());
         buf.append("},");
         buf.append("},");
     }
     }
 
 
-    private void appendElasticsearchStats(StringBuilder buf) {
+    private void appendElasticsearchStats(final StringBuilder buf) {
         String stats = null;
         String stats = null;
         try {
         try {
-            FessEsClient esClient = ComponentUtil.getFessEsClient();
-            NodesStatsResponse response =
+            final FessEsClient esClient = ComponentUtil.getFessEsClient();
+            final NodesStatsResponse response =
                     esClient.admin().cluster().prepareNodesStats().ingest(false).setBreaker(false).setDiscovery(false).setFs(true)
                     esClient.admin().cluster().prepareNodesStats().ingest(false).setBreaker(false).setDiscovery(false).setFs(true)
                             .setHttp(false).setIndices(true).setJvm(true).setOs(true).setProcess(true).setScript(false).setThreadPool(true)
                             .setHttp(false).setIndices(true).setJvm(true).setOs(true).setProcess(true).setScript(false).setThreadPool(true)
                             .setTransport(true).execute().actionGet(10000L);
                             .setTransport(true).execute().actionGet(10000L);
-            XContentBuilder builder = XContentFactory.jsonBuilder();
+            final XContentBuilder builder = XContentFactory.jsonBuilder();
             builder.startObject();
             builder.startObject();
             response.toXContent(builder, ToXContent.EMPTY_PARAMS);
             response.toXContent(builder, ToXContent.EMPTY_PARAMS);
             builder.endObject();
             builder.endObject();
             stats = builder.string();
             stats = builder.string();
-        } catch (Exception e) {
+        } catch (final Exception e) {
             logger.debug("Failed to access Elasticsearch stats.", e);
             logger.debug("Failed to access Elasticsearch stats.", e);
         }
         }
         buf.append("\"elasticsearch\":").append(stats).append(',');
         buf.append("\"elasticsearch\":").append(stats).append(',');

+ 1 - 1
src/main/java/org/codelibs/fess/util/DocumentUtil.java

@@ -27,7 +27,7 @@ public final class DocumentUtil {
     }
     }
 
 
     public static <T> T getValue(final Map<String, Object> doc, final String key, final Class<T> clazz, final T defaultValue) {
     public static <T> T getValue(final Map<String, Object> doc, final String key, final Class<T> clazz, final T defaultValue) {
-        T value = getValue(doc, key, clazz);
+        final T value = getValue(doc, key, clazz);
         if (value == null) {
         if (value == null) {
             return defaultValue;
             return defaultValue;
         }
         }

+ 3 - 3
src/main/java/org/codelibs/fess/util/ThreadDumpUtil.java

@@ -53,16 +53,16 @@ public class ThreadDumpUtil {
                 try {
                 try {
                     writer.write(s);
                     writer.write(s);
                     writer.write('\n');
                     writer.write('\n');
-                } catch (IOException e) {
+                } catch (final IOException e) {
                     throw new IORuntimeException(e);
                     throw new IORuntimeException(e);
                 }
                 }
             });
             });
-        } catch (Exception e) {
+        } catch (final Exception e) {
             logger.warn("Failed to write a thread dump to " + file, e);
             logger.warn("Failed to write a thread dump to " + file, e);
         }
         }
     }
     }
 
 
-    public static void processThreadDump(Consumer<String> writer) {
+    public static void processThreadDump(final Consumer<String> writer) {
         for (final Map.Entry<Thread, StackTraceElement[]> entry : Thread.getAllStackTraces().entrySet()) {
         for (final Map.Entry<Thread, StackTraceElement[]> entry : Thread.getAllStackTraces().entrySet()) {
             writer.accept("Thread: " + entry.getKey());
             writer.accept("Thread: " + entry.getKey());
             final StackTraceElement[] trace = entry.getValue();
             final StackTraceElement[] trace = entry.getValue();