Minor formatting/import fixes.

harishreedharan · harishreedharan · commit 0b66948d4100 · 2015-05-27T02:00:31.000-07:00
diff --git a/core/src/main/scala/org/apache/spark/deploy/history/FsHistoryProvider.scala b/core/src/main/scala/org/apache/spark/deploy/history/FsHistoryProvider.scala
@@ -17,7 +17,7 @@
 
 package org.apache.spark.deploy.history
 
-import java.io.{File, FileOutputStream, BufferedInputStream, FileNotFoundException, IOException, InputStream}
+import java.io.{BufferedInputStream, FileNotFoundException, IOException, InputStream}
 import java.util.concurrent.{ExecutorService, Executors, TimeUnit}
 
 import scala.collection.mutable
diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/EventLogDownloadResource.scala b/core/src/main/scala/org/apache/spark/status/api/v1/EventLogDownloadResource.scala
@@ -16,9 +16,9 @@
  */
 package org.apache.spark.status.api.v1
 
-import java.io.{File, FileOutputStream, BufferedInputStream, FileInputStream, OutputStream}
+import java.io.{File, FileOutputStream, OutputStream}
 import javax.ws.rs.{GET, Produces}
-import javax.ws.rs.core.{Response, StreamingOutput, MediaType}
+import javax.ws.rs.core.{MediaType, Response, StreamingOutput}
 
 import scala.collection.mutable.ArrayBuffer
 
diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/JacksonMessageWriter.scala b/core/src/main/scala/org/apache/spark/status/api/v1/JacksonMessageWriter.scala
@@ -68,7 +68,7 @@ private[v1] class JacksonMessageWriter extends MessageBodyWriter[Object]{
       multivaluedMap: MultivaluedMap[String, AnyRef],
       outputStream: OutputStream): Unit = {
     t match {
-      case ErrorWrapper(err) => outputStream.write(err.getBytes())
+      case ErrorWrapper(err) => outputStream.write(err.getBytes("utf-8"))
       case _ => mapper.writeValue(outputStream, t)
     }
   }
diff --git a/core/src/main/scala/org/apache/spark/util/Utils.scala b/core/src/main/scala/org/apache/spark/util/Utils.scala
@@ -21,8 +21,8 @@ import java.io._
 import java.lang.management.ManagementFactory
 import java.net._
 import java.nio.ByteBuffer
-import java.util.zip.{ZipEntry, ZipOutputStream}
 import java.util.{PriorityQueue, Properties, Locale, Random, UUID}
+import java.util.zip.{ZipEntry, ZipOutputStream}
 import java.util.concurrent._
 import javax.net.ssl.HttpsURLConnection
 
diff --git a/core/src/test/scala/org/apache/spark/deploy/history/FsHistoryProviderSuite.scala b/core/src/test/scala/org/apache/spark/deploy/history/FsHistoryProviderSuite.scala
@@ -17,13 +17,12 @@
 
 package org.apache.spark.deploy.history
 
-import java.io.{ByteArrayOutputStream, FileInputStream, BufferedOutputStream, File, FileOutputStream, OutputStreamWriter}
+import java.io.{BufferedOutputStream, FileInputStream, File, FileOutputStream, OutputStreamWriter}
 import java.net.URI
 import java.util.concurrent.TimeUnit
 import java.util.zip.ZipInputStream
 
 import scala.io.Source
-import scala.collection.JavaConverters._
 
 import org.apache.hadoop.fs.Path
 import org.json4s.jackson.JsonMethods._
diff --git a/core/src/test/scala/org/apache/spark/deploy/history/HistoryServerSuite.scala b/core/src/test/scala/org/apache/spark/deploy/history/HistoryServerSuite.scala
@@ -16,20 +16,20 @@
  */
 package org.apache.spark.deploy.history
 
-import java.io.{FileOutputStream, BufferedOutputStream, InputStream, File, FileInputStream, FileWriter, IOException}
+import java.io.{ BufferedOutputStream, FileOutputStream, File, FileInputStream,
+  FileWriter, InputStream, IOException}
 import java.net.{HttpURLConnection, URL}
 import java.util.zip.ZipInputStream
-import javax.servlet.http
 import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
 
 import org.apache.commons.io.{FileUtils, IOUtils}
 import org.mockito.Mockito.when
 import org.scalatest.{BeforeAndAfter, FunSuite, Matchers}
 import org.scalatest.mock.MockitoSugar
 
-import org.apache.spark.util.Utils
 import org.apache.spark.{JsonTestUtils, SecurityManager, SparkConf}
 import org.apache.spark.ui.SparkUI
+import org.apache.spark.util.Utils
 
 /**
  * A collection of tests against the historyserver, including comparing responses from the json

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ private[v1] class JacksonMessageWriter extends MessageBodyWriter[Object]{`
`68`	`68`	`multivaluedMap: MultivaluedMap[String, AnyRef],`
`69`	`69`	`outputStream: OutputStream): Unit = {`
`70`	`70`	`t match {`
`71`		`- case ErrorWrapper(err) => outputStream.write(err.getBytes())`
	`71`	`+ case ErrorWrapper(err) => outputStream.write(err.getBytes("utf-8"))`
`72`	`72`	`case _ => mapper.writeValue(outputStream, t)`
`73`	`73`	`}`
`74`	`74`	`}`