#217

src/main/java/jp/sf/fess/action/admin/SuggestBadWordAction.java

@@ -224,24 +224,18 @@ public class SuggestBadWordAction extends BsSuggestBadWordAction {
         final HttpServletResponse response = ResponseUtil.getResponse();
         response.setContentType("application/octet-stream");
         response.setHeader("Content-Disposition", "attachment; filename=\""
-                + "suggestbadword.csv" + "\"");
+                + "badword.csv" + "\"");
 
-        Writer writer = null;
-        try {
-            writer = new BufferedWriter(new OutputStreamWriter(
-                    response.getOutputStream(), crawlerProperties.getProperty(
-                            Constants.CSV_FILE_ENCODING_PROPERTY,
-                            Constants.UTF_8)));
+        try (Writer writer = new BufferedWriter(new OutputStreamWriter(
+                response.getOutputStream(), crawlerProperties.getProperty(
+                        Constants.CSV_FILE_ENCODING_PROPERTY, Constants.UTF_8)))) {
             suggestBadWordService.exportCsv(writer);
-            writer.flush();
-            return null;
         } catch (final Exception e) {
             log.error("Failed to export data.", e);
             throw new SSCActionMessagesException(e,
                     "errors.failed_to_export_data");
-        } finally {
-            IOUtils.closeQuietly(writer);
         }
+        return null;
     }
 
     @Token(save = true, validate = false)

src/main/java/jp/sf/fess/action/admin/SuggestElevateWordAction.java

@@ -221,24 +221,18 @@ public class SuggestElevateWordAction extends BsSuggestElevateWordAction {
         final HttpServletResponse response = ResponseUtil.getResponse();
         response.setContentType("application/octet-stream");
         response.setHeader("Content-Disposition", "attachment; filename=\""
-                + "suggestelevateword.csv" + "\"");
+                + "elevateword.csv" + "\"");
 
-        Writer writer = null;
-        try {
-            writer = new BufferedWriter(new OutputStreamWriter(
-                    response.getOutputStream(), crawlerProperties.getProperty(
-                            Constants.CSV_FILE_ENCODING_PROPERTY,
-                            Constants.UTF_8)));
+        try (Writer writer = new BufferedWriter(new OutputStreamWriter(
+                response.getOutputStream(), crawlerProperties.getProperty(
+                        Constants.CSV_FILE_ENCODING_PROPERTY, Constants.UTF_8)))) {
             suggestElevateWordService.exportCsv(writer);
-            writer.flush();
-            return null;
         } catch (final Exception e) {
             log.error("Failed to export data.", e);
             throw new SSCActionMessagesException(e,
                     "errors.failed_to_export_data");
-        } finally {
-            IOUtils.closeQuietly(writer);
         }
+        return null;
     }
 
     @Token(save = true, validate = false)

src/main/java/jp/sf/fess/service/SuggestBadWordService.java

@@ -133,14 +133,15 @@ public class SuggestBadWordService extends BsSuggestBadWordService implements
         cfg.setQuoteDisabled(false);
         @SuppressWarnings("resource")
         final CsvWriter csvWriter = new CsvWriter(writer, cfg);
-        final SuggestBadWordCB cb = new SuggestBadWordCB();
-        cb.query().setDeletedBy_IsNull();
         try {
-            final List<String> list = new ArrayList<String>();
+            final List<String> list = new ArrayList<>();
             list.add("SuggestWord");
             list.add("Role");
             list.add("Label");
             csvWriter.writeValues(list);
+
+            final SuggestBadWordCB cb = new SuggestBadWordCB();
+            cb.query().setDeletedBy_IsNull();
             suggestBadWordBhv.selectCursor(cb,
                     new EntityRowHandler<SuggestBadWord>() {
                         @Override
@@ -166,6 +167,7 @@ public class SuggestBadWordService extends BsSuggestBadWordService implements
                             }
                         }
                     });
+
             csvWriter.flush();
         } catch (final IOException e) {
             log.warn("Failed to write a sugget bad word.", e);

src/main/java/jp/sf/fess/service/SuggestElevateWordService.java

@@ -143,8 +143,6 @@ public class SuggestElevateWordService extends BsSuggestElevateWordService
         cfg.setQuoteDisabled(false);
         @SuppressWarnings("resource")
         final CsvWriter csvWriter = new CsvWriter(writer, cfg);
-        final SuggestElevateWordCB cb = new SuggestElevateWordCB();
-        cb.query().setDeletedBy_IsNull();
         try {
             final List<String> list = new ArrayList<String>();
             list.add("SuggestWord");
@@ -153,6 +151,9 @@ public class SuggestElevateWordService extends BsSuggestElevateWordService
             list.add("Label");
             list.add("Boost");
             csvWriter.writeValues(list);
+
+            final SuggestElevateWordCB cb = new SuggestElevateWordCB();
+            cb.query().setDeletedBy_IsNull();
             suggestElevateWordBhv.selectCursor(cb,
                     new EntityRowHandler<SuggestElevateWord>() {
                         @Override
@@ -181,6 +182,7 @@ public class SuggestElevateWordService extends BsSuggestElevateWordService
                             }
                         }
                     });
+
             csvWriter.flush();
         } catch (final IOException e) {
             log.warn("Failed to write a sugget elevate word.", e);