[lucene-solr] branch master updated: SOLR-13682: precommit errors

[no...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

noble pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/master by this push:
     new b991241  SOLR-13682: precommit errors
b991241 is described below

commit b9912411ea32260989941d52295f7f88a1fe1157
Author: noble <no...@apache.org>
AuthorDate: Sat Aug 10 17:21:17 2019 +1000

    SOLR-13682: precommit errors
---
 solr/core/src/java/org/apache/solr/util/ExportTool.java     | 3 ++-
 solr/core/src/test/org/apache/solr/util/TestExportTool.java | 7 ++++---
 solr/solr-ref-guide/src/solr-control-script-reference.adoc  | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/util/ExportTool.java b/solr/core/src/java/org/apache/solr/util/ExportTool.java
index ec29330..7b5525e 100644
--- a/solr/core/src/java/org/apache/solr/util/ExportTool.java
+++ b/solr/core/src/java/org/apache/solr/util/ExportTool.java
@@ -21,6 +21,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -248,7 +249,7 @@ public class ExportTool extends SolrCLI.ToolBase {
     @Override
     public void start() throws IOException {
       fos = new FileOutputStream(info.out);
-      writer = FastWriter.wrap(new OutputStreamWriter(fos));
+      writer = FastWriter.wrap(new OutputStreamWriter(fos, StandardCharsets.UTF_8));
       jsonw = new SolrJSONWriter(writer);
       jsonw.setIndent(false);
 
diff --git a/solr/core/src/test/org/apache/solr/util/TestExportTool.java b/solr/core/src/test/org/apache/solr/util/TestExportTool.java
index 04b182f..1fe5f66 100644
--- a/solr/core/src/test/org/apache/solr/util/TestExportTool.java
+++ b/solr/core/src/test/org/apache/solr/util/TestExportTool.java
@@ -19,8 +19,9 @@ package org.apache.solr.util;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileReader;
+import java.io.InputStreamReader;
 import java.io.Reader;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
 import org.apache.lucene.util.TestUtil;
@@ -79,7 +80,7 @@ public class TestExportTool extends SolrCloudTestCase {
 
       assertTrue(info.docsWritten >= 200);
       JsonRecordReader jsonReader = JsonRecordReader.getInst("/", Arrays.asList("$FQN:/**"));
-      Reader rdr = new FileReader(absolutePath);
+      Reader rdr = new InputStreamReader(new FileInputStream( absolutePath), StandardCharsets.UTF_8);
       try {
         int[] count = new int[]{0};
         jsonReader.streamRecords(rdr, (record, path) -> count[0]++);
@@ -97,7 +98,7 @@ public class TestExportTool extends SolrCloudTestCase {
 
       assertTrue(info.docsWritten >= 1000);
       jsonReader = JsonRecordReader.getInst("/", Arrays.asList("$FQN:/**"));
-      rdr = new FileReader(absolutePath);
+      rdr = new InputStreamReader(new FileInputStream( absolutePath), StandardCharsets.UTF_8);
       try {
         int[] count = new int[]{0};
         jsonReader.streamRecords(rdr, (record, path) -> count[0]++);
diff --git a/solr/solr-ref-guide/src/solr-control-script-reference.adoc b/solr/solr-ref-guide/src/solr-control-script-reference.adoc
index 3e57447..e71b668 100644
--- a/solr/solr-ref-guide/src/solr-control-script-reference.adoc
+++ b/solr/solr-ref-guide/src/solr-control-script-reference.adoc
@@ -889,7 +889,7 @@ Export all documents from a collection `gettingstarted` to a file called `gettin
 
 `bin/solr export -url http://localhost:8983/solr/gettingstarted limit -1`
 
-=== Arguments
+*Arguments*
 
 * `format` : `jsonl` (default) or `javabin`. `format=javabin` exports to a file with extension `.javabin` which is the native Solr format. This is compact & faster to import
 * `out` : export file name