commit 59c57fa214ddf4d9e00c8fa540dc4fc5a7ca3b45
author epugh <epugh@opensourceconnections.com> Mon Sep 21 12:02:18 2020 -0400
committer epugh <epugh@opensourceconnections.com> Mon Sep 21 12:02:18 2020 -0400
tree 18a2ca8ea578bba33c18337056240d919cad889d
parent 0e13fd36d7f852f28945f7f8f942aaff2f5cb0bd

add a test for passing in empty(null) option

solr/core/src/java/org/apache/solr/util/ExportTool.java

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 2264c3c..9fa0b8a 100644
--- a/solr/core/src/java/org/apache/solr/util/ExportTool.java
+++ b/solr/core/src/java/org/apache/solr/util/ExportTool.java
@@ -128,9 +128,11 @@
       if (limit == -1) limit = Long.MAX_VALUE;
     }
 
-    public void setOutFormat(String out, String format) {
+    public void setOutFormat(String out, String format) {      
+      if (format == null) {
+        format = "jsonl";
+      }
       this.format = format;
-      if (format == null) format = "json";
       if (!formats.contains(format)) {
         throw new IllegalArgumentException("format must be one of :" + formats);
       }

solr/core/src/test/org/apache/solr/util/TestExportTool.java

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 97acc0c..5419baf 100644
--- a/solr/core/src/test/org/apache/solr/util/TestExportTool.java
+++ b/solr/core/src/test/org/apache/solr/util/TestExportTool.java
@@ -57,6 +57,12 @@
     info.setOutFormat(null, "json");
   }
 
+  public void testJsonlDefaultOutputFileFormat() throws Exception {
+    ExportTool.Info info = new ExportTool.MultiThreadedRunner("http://somesolr/mycollection/");
+    info.setOutFormat(null, null);
+    assertEquals("jsonl", info.format);
+  }
+
   public void testJsonlValidOutputFileFormat() throws Exception {
     ExportTool.Info info = new ExportTool.MultiThreadedRunner("http://somesolr/mycollection/");
     info.setOutFormat(null, "jsonl");