Revert lineSepInWrite back to lineSep

Author: MaxGekk

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/json/JSONOptions.scala

@@ -113,7 +113,9 @@ private[sql] class JSONOptions(
   val lineSeparatorInRead: Option[Array[Byte]] = lineSeparator
 
   // Note that JSON uses writer with UTF-8 charset. This string will be written out as UTF-8.
-  val lineSeparatorInWrite: String = parameters.get("lineSepInWrite").getOrElse("\n")
+  val lineSeparatorInWrite: String = {
+    lineSeparator.map(new String(_, charset.getOrElse("UTF-8"))).getOrElse("\n")
+  }
 
   /** Sets config options on a Jackson [[JsonFactory]]. */
   def setJacksonOptions(factory: JsonFactory): Unit = {

sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/json/JsonSuite.scala

@@ -2131,7 +2131,7 @@ class JsonSuite extends QueryTest with SharedSQLContext with TestJsonData {
       // Write
       withTempPath { path =>
         Seq("a", "b", "c").toDF("value").coalesce(1)
-          .write.option("lineSepInWrite", lineSep).json(path.getAbsolutePath)
+          .write.option("lineSep", lineSep).json(path.getAbsolutePath)
         val partFile = TestUtils.recursiveList(path).filter(f => f.getName.startsWith("part-")).head
         val readBack = new String(Files.readAllBytes(partFile.toPath), StandardCharsets.UTF_8)
         assert(
@@ -2141,7 +2141,7 @@ class JsonSuite extends QueryTest with SharedSQLContext with TestJsonData {
       // Roundtrip
       withTempPath { path =>
         val df = Seq("a", "b", "c").toDF()
-        df.write.option("lineSepInWrite", lineSep).json(path.getAbsolutePath)
+        df.write.option("lineSep", lineSep).json(path.getAbsolutePath)
         val readBack = spark.read.option("lineSep", lineSep).json(path.getAbsolutePath)
         checkAnswer(df, readBack)
       }