diff --git a/src/main/java/jp/sf/fess/action/admin/LogAction.java b/src/main/java/jp/sf/fess/action/admin/LogAction.java index 188a331bf..986288eb9 100644 --- a/src/main/java/jp/sf/fess/action/admin/LogAction.java +++ b/src/main/java/jp/sf/fess/action/admin/LogAction.java @@ -83,7 +83,8 @@ public class LogAction implements Serializable { .getBytes(Constants.UTF_8)), Constants.UTF_8); } catch (final UnsupportedEncodingException e1) { fileName = new String(Base64.decodeBase64(logForm.logFileName - .getBytes()), Charset.defaultCharset()); + .getBytes(Charset.defaultCharset())), + Charset.defaultCharset()); } final File logFile = new File(parentDir, fileName); if (logFile.isFile()) { @@ -155,8 +156,9 @@ public class LogAction implements Serializable { Constants.UTF_8)), "UTF-8")); } catch (final UnsupportedEncodingException e) { map.put("logFileName", - new String(Base64.encodeBase64(file.getName().getBytes()), - Charset.defaultCharset())); + new String(Base64.encodeBase64(file.getName().getBytes( + Charset.defaultCharset())), Charset + .defaultCharset())); } map.put("lastModified", new Date(file.lastModified())); return map; diff --git a/src/main/java/jp/sf/fess/api/WebApiResponse.java b/src/main/java/jp/sf/fess/api/WebApiResponse.java index 5b03bbb5c..7ba402bf3 100644 --- a/src/main/java/jp/sf/fess/api/WebApiResponse.java +++ b/src/main/java/jp/sf/fess/api/WebApiResponse.java @@ -33,7 +33,7 @@ public class WebApiResponse extends HttpServletResponseWrapper { @Override public PrintWriter getWriter() throws IOException { // dummy stream - return new PrintWriter(new ByteArrayOutputStream()); + return new PrintWriter(new ByteArrayOutputStream()); // NOSONAR } } diff --git a/src/main/java/jp/sf/fess/dict/DictionaryItem.java b/src/main/java/jp/sf/fess/dict/DictionaryItem.java index a23049a97..c55203f47 100644 --- a/src/main/java/jp/sf/fess/dict/DictionaryItem.java +++ b/src/main/java/jp/sf/fess/dict/DictionaryItem.java @@ -1,5 +1,10 @@ package jp.sf.fess.dict; public abstract class DictionaryItem { + protected long id; + + public long getId() { + return id; + } } diff --git a/src/main/java/jp/sf/fess/dict/synonym/SynonymItem.java b/src/main/java/jp/sf/fess/dict/synonym/SynonymItem.java index 2ad62d6c5..68d9c321d 100644 --- a/src/main/java/jp/sf/fess/dict/synonym/SynonymItem.java +++ b/src/main/java/jp/sf/fess/dict/synonym/SynonymItem.java @@ -15,8 +15,6 @@ public class SynonymItem extends DictionaryItem { private String[] newOutputs; - private final long id; - public SynonymItem(final long id, final String[] inputs, final String[] outputs) { this.id = id; @@ -34,10 +32,6 @@ public class SynonymItem extends DictionaryItem { } } - public long getId() { - return id; - } - public String[] getNewInputs() { return newInputs; } diff --git a/src/main/java/jp/sf/fess/helper/SearchLogHelper.java b/src/main/java/jp/sf/fess/helper/SearchLogHelper.java index 0895f5a52..e47d1b30e 100644 --- a/src/main/java/jp/sf/fess/helper/SearchLogHelper.java +++ b/src/main/java/jp/sf/fess/helper/SearchLogHelper.java @@ -86,8 +86,7 @@ public abstract class SearchLogHelper { .getComponent(ClickLogBhv.class); final ClickLogCB cb = new ClickLogCB(); cb.query().setUrl_Equal(url); - final int count = clickLogBhv.selectCount(cb); - return count; + return clickLogBhv.selectCount(cb); } public long getFavoriteCount(final String url) {