0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

apply code format

Browse source
This commit is contained in:
Shinsuke Sugaya 2014-10-28 06:57:04 +09:00
parent 5be7e988a9
commit 6175cfffed
7 changed files with 95 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/main/java/jp/sf/fess/action/admin/SuggestBadWordAction.java
View file

@ -16,7 +16,16 @@
package jp.sf.fess.action.admin;
import java.io.*;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
import java.sql.Timestamp;
import javax.annotation.Resource;
@ -77,8 +86,8 @@ public class SuggestBadWordAction extends BsSuggestBadWordAction {
}
FessBeans.copy(suggestBadWord, suggestBadWordForm)
.commonColumnDateConverter().excludes("searchParams", "mode")
.execute();
.commonColumnDateConverter().excludes("searchParams", "mode")
.execute();
}
@Override
@ -103,7 +112,7 @@ public class SuggestBadWordAction extends BsSuggestBadWordAction {
suggestBadWord.setUpdatedBy(username);
suggestBadWord.setUpdatedTime(timestamp);
FessBeans.copy(suggestBadWordForm, suggestBadWord)
.excludesCommonColumns().execute();
.excludesCommonColumns().execute();
return suggestBadWord;
}
@ -114,7 +123,7 @@ public class SuggestBadWordAction extends BsSuggestBadWordAction {
if (suggestBadWordForm.crudMode != CommonConstants.DELETE_MODE) {
throw new SSCActionMessagesException("errors.crud_invalid_mode",
new Object[] { CommonConstants.DELETE_MODE,
suggestBadWordForm.crudMode });
suggestBadWordForm.crudMode });
}
try {
@ -221,8 +230,8 @@ public class SuggestBadWordAction extends BsSuggestBadWordAction {
try {
writer = new BufferedWriter(new OutputStreamWriter(
response.getOutputStream(), crawlerProperties.getProperty(
Constants.CSV_FILE_ENCODING_PROPERTY,
Constants.UTF_8)));
Constants.CSV_FILE_ENCODING_PROPERTY,
Constants.UTF_8)));
suggestBadWordService.exportCsv(writer);
writer.flush();
return null;
@ -250,7 +259,8 @@ public class SuggestBadWordAction extends BsSuggestBadWordAction {
final byte[] b = new byte[20];
try {
tempFile = File.createTempFile("suggestbadword-import-", ".csv");
is = new BufferedInputStream(suggestBadWordForm.suggestBadWordFile.getInputStream());
is = new BufferedInputStream(
suggestBadWordForm.suggestBadWordFile.getInputStream());
is.mark(20);
if (is.read(b, 0, 20) <= 0) {
throw new FessSystemException("no import data.");
@ -260,8 +270,7 @@ public class SuggestBadWordAction extends BsSuggestBadWordAction {
StreamUtil.drain(is, fos);
} catch (final Exception e) {
if (tempFile != null && !tempFile.delete()) {
log.warn("Could not delete "
+ tempFile.getAbsolutePath());
log.warn("Could not delete " + tempFile.getAbsolutePath());
}
log.error("Failed to import data.", e);
throw new SSCActionMessagesException(e,
@ -275,7 +284,8 @@ public class SuggestBadWordAction extends BsSuggestBadWordAction {
try {
final String head = new String(b, Constants.UTF_8);
if (!head.startsWith("\"SuggestWord\",")) {
log.error("Unknown file: " + suggestBadWordForm.suggestBadWordFile);
log.error("Unknown file: "
+ suggestBadWordForm.suggestBadWordFile);
throw new SSCActionMessagesException(
"errors.unknown_import_file");
}
@ -291,8 +301,8 @@ public class SuggestBadWordAction extends BsSuggestBadWordAction {
suggestBadWordService.importCsv(reader);
} catch (final Exception e) {
log.error("Failed to import data.", e);
throw new FessSystemException(
"Failed to import data.", e);
throw new FessSystemException("Failed to import data.",
e);
} finally {
if (!oFile.delete()) {
log.warn("Could not delete "

36
src/main/java/jp/sf/fess/action/admin/SuggestElevateWordAction.java
View file

@ -16,7 +16,16 @@
package jp.sf.fess.action.admin;
import java.io.*;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
import java.sql.Timestamp;
import javax.annotation.Resource;
@ -218,8 +227,8 @@ public class SuggestElevateWordAction extends BsSuggestElevateWordAction {
try {
writer = new BufferedWriter(new OutputStreamWriter(
response.getOutputStream(), crawlerProperties.getProperty(
Constants.CSV_FILE_ENCODING_PROPERTY,
Constants.UTF_8)));
Constants.CSV_FILE_ENCODING_PROPERTY,
Constants.UTF_8)));
suggestElevateWordService.exportCsv(writer);
writer.flush();
return null;
@ -246,8 +255,11 @@ public class SuggestElevateWordAction extends BsSuggestElevateWordAction {
FileOutputStream fos = null;
final byte[] b = new byte[20];
try {
tempFile = File.createTempFile("suggestelevateword-import-", ".csv");
is = new BufferedInputStream(suggestElevateWordForm.suggestElevateWordFile.getInputStream());
tempFile = File
.createTempFile("suggestelevateword-import-", ".csv");
is = new BufferedInputStream(
suggestElevateWordForm.suggestElevateWordFile
.getInputStream());
is.mark(20);
if (is.read(b, 0, 20) <= 0) {
throw new FessSystemException("no import data.");
@ -257,8 +269,7 @@ public class SuggestElevateWordAction extends BsSuggestElevateWordAction {
StreamUtil.drain(is, fos);
} catch (final Exception e) {
if (tempFile != null && !tempFile.delete()) {
log.warn("Could not delete "
+ tempFile.getAbsolutePath());
log.warn("Could not delete " + tempFile.getAbsolutePath());
}
log.error("Failed to import data.", e);
throw new SSCActionMessagesException(e,
@ -272,7 +283,8 @@ public class SuggestElevateWordAction extends BsSuggestElevateWordAction {
try {
final String head = new String(b, Constants.UTF_8);
if (!head.startsWith("\"SuggestWord\",")) {
log.error("Unknown file: " + suggestElevateWordForm.suggestElevateWordFile);
log.error("Unknown file: "
+ suggestElevateWordForm.suggestElevateWordFile);
throw new SSCActionMessagesException(
"errors.unknown_import_file");
}
@ -288,8 +300,8 @@ public class SuggestElevateWordAction extends BsSuggestElevateWordAction {
suggestElevateWordService.importCsv(reader);
} catch (final Exception e) {
log.error("Failed to import data.", e);
throw new FessSystemException(
"Failed to import data.", e);
throw new FessSystemException("Failed to import data.",
e);
} finally {
if (!oFile.delete()) {
log.warn("Could not delete "
@ -313,8 +325,8 @@ public class SuggestElevateWordAction extends BsSuggestElevateWordAction {
throw new SSCActionMessagesException(e,
"errors.failed_to_import_data");
}
SAStrutsUtil.addSessionMessage("success.upload_suggest_elevate_word");
SAStrutsUtil.addSessionMessage("success.upload_suggest_elevate_word");
return "uploadpage?redirect=true";
return "uploadpage?redirect=true";
}
}

1
src/main/java/jp/sf/fess/form/admin/SuggestBadWordForm.java
View file

@ -19,6 +19,7 @@ package jp.sf.fess.form.admin;
import java.io.Serializable;
import jp.sf.fess.crud.form.admin.BsSuggestBadWordForm;
import org.apache.struts.upload.FormFile;
import org.seasar.struts.annotation.Required;

1
src/main/java/jp/sf/fess/form/admin/SuggestElevateWordForm.java
View file

@ -19,6 +19,7 @@ package jp.sf.fess.form.admin;
import java.io.Serializable;
import jp.sf.fess.crud.form.admin.BsSuggestElevateWordForm;
import org.apache.struts.upload.FormFile;
import org.seasar.struts.annotation.Required;

18
src/main/java/jp/sf/fess/helper/SuggestHelper.java
View file

@ -1,3 +1,19 @@
/*
* Copyright 2009-2014 the CodeLibs Project and the Others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
* either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/
package jp.sf.fess.helper;
import java.io.BufferedWriter;
@ -125,7 +141,7 @@ public class SuggestHelper {
}
suggestService
.addElevateWord(word, reading, labelList, roleList, boost);
.addElevateWord(word, reading, labelList, roleList, boost);
if (commit) {
suggestService.commit();

25
src/main/java/jp/sf/fess/service/SuggestBadWordService.java
View file

@ -25,7 +25,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import jp.sf.fess.action.admin.SuggestBadWordAction;
import jp.sf.fess.crud.service.BsSuggestBadWordService;
import jp.sf.fess.db.cbean.SuggestBadWordCB;
import jp.sf.fess.db.exentity.SuggestBadWord;
@ -33,6 +32,7 @@ import jp.sf.fess.pager.SuggestBadWordPager;
import jp.sf.orangesignal.csv.CsvConfig;
import jp.sf.orangesignal.csv.CsvReader;
import jp.sf.orangesignal.csv.CsvWriter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.codelibs.core.util.StringUtil;
@ -101,18 +101,21 @@ public class SuggestBadWordService extends BsSuggestBadWordService implements
suggestBadWord.setTargetRole(strip(list.get(1)));
suggestBadWord.setTargetLabel(strip(list.get(2)));
suggestBadWord.setCreatedBy("system");
suggestBadWord.setCreatedTime(new Timestamp(System.currentTimeMillis()));
suggestBadWord.setCreatedTime(new Timestamp(System
.currentTimeMillis()));
suggestBadWordBhv.insert(suggestBadWord);
} else if (list.get(1).equals("\"\"") &&
list.get(2).equals("\"\"")) {
} else if (list.get(1).equals("\"\"")
&& list.get(2).equals("\"\"")) {
suggestBadWord.setDeletedBy("system");
suggestBadWord.setDeletedTime(new Timestamp(System.currentTimeMillis()));
suggestBadWord.setDeletedTime(new Timestamp(System
.currentTimeMillis()));
suggestBadWordBhv.update(suggestBadWord);
} else {
suggestBadWord.setTargetRole(strip(list.get(1)));
suggestBadWord.setTargetLabel(strip(list.get(2)));
suggestBadWord.setUpdatedBy("system");
suggestBadWord.setUpdatedTime(new Timestamp(System.currentTimeMillis()));
suggestBadWord.setUpdatedTime(new Timestamp(System
.currentTimeMillis()));
suggestBadWordBhv.update(suggestBadWord);
}
} catch (final Exception e) {
@ -124,7 +127,6 @@ public class SuggestBadWordService extends BsSuggestBadWordService implements
}
}
public void exportCsv(final Writer writer) {
final CsvConfig cfg = new CsvConfig(',', '"', '"');
cfg.setEscapeDisabled(false);
@ -150,14 +152,13 @@ public class SuggestBadWordService extends BsSuggestBadWordService implements
try {
csvWriter.writeValues(list);
} catch (final IOException e) {
log.warn(
"Failed to write a sugget bad word: "
+ entity, e);
log.warn("Failed to write a sugget bad word: "
+ entity, e);
}
}
private void addToList(final List<String> list,
final Object value) {
final Object value) {
if (value == null) {
list.add(StringUtil.EMPTY);
} else {
@ -171,7 +172,7 @@ public class SuggestBadWordService extends BsSuggestBadWordService implements
}
}
private static String strip(String item) {
private static String strip(final String item) {
return item.substring(1, item.length() - 1);
}
}

26
src/main/java/jp/sf/fess/service/SuggestElevateWordService.java
View file

@ -33,6 +33,7 @@ import jp.sf.fess.pager.SuggestElevateWordPager;
import jp.sf.orangesignal.csv.CsvConfig;
import jp.sf.orangesignal.csv.CsvReader;
import jp.sf.orangesignal.csv.CsvWriter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.codelibs.core.util.StringUtil;
@ -103,23 +104,28 @@ public class SuggestElevateWordService extends BsSuggestElevateWordService
suggestElevateWord.setReading(strip(list.get(1)));
suggestElevateWord.setTargetRole(strip(list.get(2)));
suggestElevateWord.setTargetLabel(strip(list.get(3)));
suggestElevateWord.setBoost(new BigDecimal(strip(list.get(4))));
suggestElevateWord.setBoost(new BigDecimal(strip(list
.get(4))));
suggestElevateWord.setCreatedBy("system");
suggestElevateWord.setCreatedTime(new Timestamp(System.currentTimeMillis()));
suggestElevateWord.setCreatedTime(new Timestamp(System
.currentTimeMillis()));
suggestElevateWordBhv.insert(suggestElevateWord);
} else if (list.get(1).equals("\"\"") &&
list.get(2).equals("\"\"") &&
list.get(3).equals("\"\"")) {
} else if (list.get(1).equals("\"\"")
&& list.get(2).equals("\"\"")
&& list.get(3).equals("\"\"")) {
suggestElevateWord.setDeletedBy("system");
suggestElevateWord.setDeletedTime(new Timestamp(System.currentTimeMillis()));
suggestElevateWord.setDeletedTime(new Timestamp(System
.currentTimeMillis()));
suggestElevateWordBhv.update(suggestElevateWord);
} else {
suggestElevateWord.setReading(strip(list.get(1)));
suggestElevateWord.setTargetRole(strip(list.get(2)));
suggestElevateWord.setTargetLabel(strip(list.get(3)));
suggestElevateWord.setBoost(new BigDecimal(strip(list.get(4))));
suggestElevateWord.setBoost(new BigDecimal(strip(list
.get(4))));
suggestElevateWord.setUpdatedBy("system");
suggestElevateWord.setUpdatedTime(new Timestamp(System.currentTimeMillis()));
suggestElevateWord.setUpdatedTime(new Timestamp(System
.currentTimeMillis()));
suggestElevateWordBhv.update(suggestElevateWord);
}
} catch (final Exception e) {
@ -167,7 +173,7 @@ public class SuggestElevateWordService extends BsSuggestElevateWordService
}
private void addToList(final List<String> list,
final Object value) {
final Object value) {
if (value == null) {
list.add(StringUtil.EMPTY);
} else {
@ -181,7 +187,7 @@ public class SuggestElevateWordService extends BsSuggestElevateWordService
}
}
private static String strip(String item) {
private static String strip(final String item) {
return item.substring(1, item.length() - 1);
}
}