Skip to content

Commit c604a3c

Browse files
SPARK-1729. Optimize imports.
1 parent 0f10788 commit c604a3c

File tree

4 files changed

+35
-22
lines changed

4 files changed

+35
-22
lines changed

external/flume/src/main/scala/org/apache/spark/streaming/flume/EventTransformer.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818
package org.apache.spark.streaming.flume
1919

2020
import java.io.{ObjectOutput, ObjectInput}
21-
import org.apache.spark.util.Utils
21+
2222
import scala.collection.JavaConversions._
23+
24+
import org.apache.spark.util.Utils
2325
import org.apache.spark.Logging
2426

2527
/**

external/flume/src/main/scala/org/apache/spark/streaming/flume/FlumePollingInputDStream.scala

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,29 @@
1616
*/
1717
package org.apache.spark.streaming.flume
1818

19-
import scala.reflect.ClassTag
20-
import org.apache.spark.streaming.StreamingContext
21-
import org.apache.spark.storage.StorageLevel
22-
import org.apache.spark.streaming.dstream.ReceiverInputDStream
23-
import org.apache.spark.streaming.receiver.Receiver
24-
import org.apache.spark.Logging
19+
20+
import java.io.{ObjectOutput, ObjectInput, Externalizable}
2521
import java.net.InetSocketAddress
22+
import java.nio.ByteBuffer
2623
import java.util.concurrent.{TimeUnit, Executors}
24+
25+
import scala.collection.JavaConversions._
26+
import scala.collection.mutable
27+
import scala.reflect.ClassTag
28+
29+
import com.google.common.util.concurrent.ThreadFactoryBuilder
2730
import org.apache.avro.ipc.NettyTransceiver
2831
import org.apache.avro.ipc.specific.SpecificRequestor
29-
import org.apache.spark.flume.{SparkSinkEvent, SparkFlumeProtocol}
3032
import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory
31-
import com.google.common.util.concurrent.ThreadFactoryBuilder
32-
import java.io.{ObjectOutput, ObjectInput, Externalizable}
33-
import java.nio.ByteBuffer
34-
import scala.collection.JavaConversions._
35-
import scala.collection.mutable
33+
34+
import org.apache.spark.Logging
35+
import org.apache.spark.flume.{SparkSinkEvent, SparkFlumeProtocol}
36+
import org.apache.spark.storage.StorageLevel
37+
import org.apache.spark.streaming.StreamingContext
38+
import org.apache.spark.streaming.dstream.ReceiverInputDStream
39+
import org.apache.spark.streaming.receiver.Receiver
40+
41+
3642

3743
class FlumePollingInputDStream[T: ClassTag](
3844
@transient ssc_ : StreamingContext,

external/flume/src/main/scala/org/apache/spark/streaming/flume/FlumeUtils.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@
1717

1818
package org.apache.spark.streaming.flume
1919

20+
import java.net.InetSocketAddress
21+
2022
import org.apache.spark.storage.StorageLevel
2123
import org.apache.spark.streaming.StreamingContext
2224
import org.apache.spark.streaming.api.java.{JavaReceiverInputDStream, JavaStreamingContext}
2325
import org.apache.spark.streaming.dstream.ReceiverInputDStream
24-
import java.net.InetSocketAddress
26+
2527

2628
object FlumeUtils {
2729
/**

external/flume/src/test/scala/org/apache/spark/streaming/flume/FlumePollingReceiverSuite.scala

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,22 @@
1818
*/
1919
package org.apache.spark.streaming.flume
2020

21-
import org.apache.spark.streaming.{TestSuiteBase, TestOutputStream, StreamingContext}
22-
import org.apache.spark.storage.StorageLevel
21+
import java.net.InetSocketAddress
22+
import java.util.concurrent.{Callable, ExecutorCompletionService, Executors}
23+
24+
import scala.collection.JavaConversions._
2325
import scala.collection.mutable.{SynchronizedBuffer, ArrayBuffer}
24-
import org.apache.spark.streaming.util.ManualClock
25-
import org.apache.flume.channel.MemoryChannel
26+
2627
import org.apache.flume.Context
28+
import org.apache.flume.channel.MemoryChannel
2729
import org.apache.flume.conf.Configurables
28-
import org.apache.spark.flume.sink.{SparkSinkConfig, SparkSink}
29-
import scala.collection.JavaConversions._
3030
import org.apache.flume.event.EventBuilder
31+
32+
import org.apache.spark.flume.sink.{SparkSinkConfig, SparkSink}
33+
import org.apache.spark.storage.StorageLevel
3134
import org.apache.spark.streaming.dstream.ReceiverInputDStream
32-
import java.net.InetSocketAddress
33-
import java.util.concurrent.{Callable, ExecutorCompletionService, Executors}
35+
import org.apache.spark.streaming.util.ManualClock
36+
import org.apache.spark.streaming.{TestSuiteBase, TestOutputStream, StreamingContext}
3437

3538
class FlumePollingReceiverSuite extends TestSuiteBase {
3639

0 commit comments

Comments
 (0)