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

update lastaflute

Browse source
This commit is contained in:
Shinsuke Sugaya 2016-01-01 17:51:34 +09:00
parent 9b6d0e5248
commit b0bbf01909
8 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pom.xml
View file

@ -41,11 +41,11 @@
<!-- Main Framework -->
<dbflute.version>1.1.0-sp9</dbflute.version>
<lastaflute.version>0.7.4-RC1</lastaflute.version>
<lastaflute.version>0.7.5-RC2</lastaflute.version>
<lasta.taglib.version>0.6.7</lasta.taglib.version>
<servlet.version>3.1.0</servlet.version>
<jsp.version>2.3.1</jsp.version>
<mailflute.version>0.4.6</mailflute.version>
<mailflute.version>0.4.8</mailflute.version>
<!-- Partner Library -->
<slf4j.version>1.7.12</slf4j.version>

2
src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java
View file

@ -57,7 +57,7 @@ public class AdminBackupAction extends FessAdminAction {
@Execute
public ActionResponse download(final String id) {
if (StreamUtil.of(fessConfig.getIndexBackupTargetsAsArray()).anyMatch(s -> s.equals(id))) {
return asStream(id + ".json").stream(
return asStream(id + ".bulk").contentTypeOctetStream().stream(
out -> {
try (CurlResponse response =
Curl.get(ResourceUtil.getElasticsearchHttpUrl() + "/" + id + "/_data").param("format", "json").execute()) {

2
src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java
View file

@ -188,7 +188,7 @@ public class AdminBadwordAction extends FessAdminAction {
public ActionResponse download(final DownloadForm form) {
verifyToken(() -> asDownloadHtml());
return asStream("badword.csv").stream(out -> {
return asStream("badword.csv").contentTypeOctetStream().stream(out -> {
final Path tempFile = Files.createTempFile(null, null);
try {
try (Writer writer = new BufferedWriter(new OutputStreamWriter(Files.newOutputStream(tempFile), getCsvEncoding()))) {

2
src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java
View file

@ -190,7 +190,7 @@ public class AdminDesignAction extends FessAdminAction implements Serializable {
}
validate(form, messages -> {}, () -> asListHtml());
verifyToken(() -> asListHtml());
return asStream(file.getName()).stream(out -> {
return asStream(file.getName()).contentTypeOctetStream().stream(out -> {
try (FileInputStream fis = new FileInputStream(file)) {
out.write(fis);
}

2
src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java
View file

@ -214,7 +214,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
validate(form, messages -> {}, () -> downloadpage(form.dictId));
verifyTokenKeep(() -> downloadpage(form.dictId));
return kuromojiService.getKuromojiFile(form.dictId).map(file -> {
return asStream(new File(file.getPath()).getName()).stream(out -> {
return asStream(new File(file.getPath()).getName()).contentTypeOctetStream().stream(out -> {
try (InputStream inputStream = file.getInputStream()) {
out.write(inputStream);
}

2
src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java
View file

@ -218,7 +218,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
validate(form, messages -> {}, () -> downloadpage(form.dictId));
verifyTokenKeep(() -> downloadpage(form.dictId));
return synonymService.getSynonymFile(form.dictId).map(file -> {
return asStream(new File(file.getPath()).getName()).stream(out -> {
return asStream(new File(file.getPath()).getName()).contentTypeOctetStream().stream(out -> {
try (InputStream inputStream = file.getInputStream()) {
out.write(inputStream);
}

2
src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java
View file

@ -195,7 +195,7 @@ public class AdminElevatewordAction extends FessAdminAction {
public ActionResponse download(final DownloadForm form) {
verifyToken(() -> asDownloadHtml());
return asStream("elevate.csv").stream(out -> {
return asStream("elevate.csv").contentTypeOctetStream().stream(out -> {
final Path tempFile = Files.createTempFile(null, null);
try {
try (Writer writer = new BufferedWriter(new OutputStreamWriter(Files.newOutputStream(tempFile), getCsvEncoding()))) {

2
src/main/java/org/codelibs/fess/app/web/admin/log/AdminLogAction.java
View file

@ -68,7 +68,7 @@ public class AdminLogAction extends FessAdminAction {
final String logFilePath = systemHelper.getLogFilePath();
if (StringUtil.isNotBlank(logFilePath)) {
final Path path = Paths.get(logFilePath, filename);
return asStream(filename).stream(out -> {
return asStream(filename).contentTypeOctetStream().stream(out -> {
try (InputStream in = Files.newInputStream(path)) {
out.write(in);
}