diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorCreationPerfSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorCreationPerfSpec.scala index a04637fb3c..85e13b262d 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorCreationPerfSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorCreationPerfSpec.scala @@ -10,7 +10,7 @@ import scala.concurrent.duration._ import akka.testkit.metrics._ import org.scalatest.BeforeAndAfterAll import akka.testkit.metrics.HeapMemoryUsage -import com.codahale.metrics.{ Timer, Histogram } +import com.codahale.metrics.{ Histogram } object ActorCreationPerfSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala index 5607459a7b..cf13952c44 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala @@ -7,7 +7,6 @@ package akka.actor import language.postfixOps import org.scalatest.BeforeAndAfterEach -import org.scalatest.Matchers import akka.actor.Actor._ import akka.testkit._ diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorMailboxSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorMailboxSpec.scala index a2f14b9931..47e73d2071 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorMailboxSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorMailboxSpec.scala @@ -10,7 +10,6 @@ import akka.dispatch._ import scala.concurrent.duration.{ Duration, FiniteDuration } import akka.ConfigurationException import com.typesafe.config.Config -import java.util.concurrent.TimeUnit import akka.util.Helpers.ConfigOps object ActorMailboxSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala index 69f89488b4..18262f6f77 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala @@ -15,7 +15,6 @@ import akka.japi.Util.immutableSeq import akka.pattern.ask import akka.dispatch._ import com.typesafe.config.Config -import java.util.concurrent.{ LinkedBlockingQueue, BlockingQueue, TimeUnit } import akka.util.Switch import akka.util.Helpers.ConfigOps import scala.util.control.NoStackTrace diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorWithBoundedStashSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorWithBoundedStashSpec.scala index eb03bee743..a89bc12c86 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorWithBoundedStashSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorWithBoundedStashSpec.scala @@ -9,12 +9,9 @@ import akka.testkit._ import akka.testkit.DefaultTimeout import akka.testkit.TestEvent._ import akka.dispatch.BoundedDequeBasedMailbox -import akka.pattern.ask -import scala.concurrent.Await import scala.concurrent.duration._ import akka.actor.ActorSystem.Settings import com.typesafe.config.{ Config, ConfigFactory } -import org.scalatest.Assertions.intercept import org.scalatest.BeforeAndAfterEach object ActorWithBoundedStashSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala index 2d92213717..03d34ad4a8 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala @@ -11,7 +11,6 @@ import akka.testkit.TestEvent._ import scala.concurrent.Await import akka.pattern.ask import scala.concurrent.duration._ -import com.typesafe.config.{ Config, ConfigFactory } import org.scalatest.BeforeAndAfterEach import org.scalatest.junit.JUnitSuiteLike diff --git a/akka-actor-tests/src/test/scala/akka/actor/ConsistencySpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ConsistencySpec.scala index 44c25248dc..691e3002d7 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ConsistencySpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ConsistencySpec.scala @@ -3,7 +3,7 @@ package akka.actor import language.postfixOps import akka.testkit.AkkaSpec -import akka.dispatch.{ ThreadPoolConfig, ThreadPoolConfigBuilder, UnboundedMailbox } +import akka.dispatch.{ ThreadPoolConfig } import scala.concurrent.duration._ object ConsistencySpec { @@ -69,4 +69,4 @@ class ConsistencySpec extends AkkaSpec(ConsistencySpec.config) { for (a ← actors) expectMsg(5 minutes, "done") } } -} \ No newline at end of file +} diff --git a/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala index 820947d4f8..30900cb3ee 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala @@ -4,20 +4,13 @@ package akka.actor -import akka.actor.FSM.StateTimeout - import language.postfixOps -import org.scalatest.{ BeforeAndAfterAll, BeforeAndAfterEach } import akka.testkit._ -import TestEvent.Mute import scala.concurrent.duration._ import akka.event._ import com.typesafe.config.ConfigFactory import scala.concurrent.Await import akka.util.Timeout -import org.scalatest.matchers.Matcher -import org.scalatest.matchers.HavePropertyMatcher -import org.scalatest.matchers.HavePropertyMatchResult object FSMActorSpec { val timeout = Timeout(2 seconds) diff --git a/akka-actor-tests/src/test/scala/akka/actor/FSMTimingSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/FSMTimingSpec.scala index b397319e32..9ae827c5ed 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/FSMTimingSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/FSMTimingSpec.scala @@ -8,7 +8,6 @@ import language.postfixOps import akka.testkit._ import scala.concurrent.duration._ -import akka.event.Logging @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class FSMTimingSpec extends AkkaSpec with ImplicitSender { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala index e57278e88e..49a468f004 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala @@ -8,8 +8,6 @@ import language.postfixOps import akka.testkit._ import scala.concurrent.duration._ -import akka.actor.Actor._ -import scala.concurrent.Await import akka.pattern.{ ask, pipe } object ForwardActorSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala b/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala index f854dfa23d..5ed5c13eaf 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala @@ -7,11 +7,9 @@ package akka.actor import language.postfixOps import java.lang.Thread.sleep -import org.scalatest.BeforeAndAfterAll import scala.concurrent.Await import akka.testkit.TestEvent._ import akka.testkit.EventFilter -import java.util.concurrent.{ TimeUnit, CountDownLatch } import akka.testkit.AkkaSpec import akka.testkit.DefaultTimeout import akka.testkit.TestLatch diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala index d6b9d65aa4..3c9622908e 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala @@ -7,7 +7,6 @@ import language.postfixOps import akka.testkit.{ filterEvents, EventFilter } import scala.concurrent.Await -import akka.dispatch.{ PinnedDispatcher, Dispatchers } import java.util.concurrent.{ TimeUnit, CountDownLatch } import akka.testkit.AkkaSpec import akka.testkit.DefaultTimeout diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala index ef0dbe6dab..0568fa0652 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala @@ -5,13 +5,9 @@ package akka.actor import language.postfixOps -import org.scalatest.WordSpec -import org.scalatest.Matchers import scala.concurrent.Await import scala.concurrent.duration._ -import akka.actor.Actor._ -import akka.testkit.{ TestKit, EventFilter, filterEvents, filterException, AkkaSpec, ImplicitSender, DefaultTimeout } -import akka.dispatch.Dispatchers +import akka.testkit.{ EventFilter, AkkaSpec, ImplicitSender, DefaultTimeout } import akka.pattern.ask @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) diff --git a/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala b/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala index 2c9add6e6a..44440d5973 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala @@ -5,10 +5,8 @@ package akka.actor import language.postfixOps -import java.util.concurrent.{ CountDownLatch, TimeUnit } -import akka.actor._ import org.scalatest.BeforeAndAfterAll -import akka.testkit.{ TestKit, filterEvents, EventFilter } +import akka.testkit.{ filterEvents, EventFilter } import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender import akka.testkit.DefaultTimeout diff --git a/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala index 3acc695ab5..60c38b06b8 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala @@ -20,7 +20,6 @@ import scala.collection.immutable import scala.concurrent.duration._ import scala.concurrent.{ Await, Future, Promise } import scala.language.postfixOps -import scala.util.Random object TypedActorSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala index 43aa4d6c31..a9632de68e 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala @@ -9,9 +9,7 @@ import java.rmi.RemoteException import java.util.concurrent.{ TimeUnit, CountDownLatch, ConcurrentHashMap } import java.util.concurrent.atomic.{ AtomicLong, AtomicInteger } -import org.junit.runner.RunWith import org.scalatest.Assertions._ -import org.scalatest.junit.JUnitRunner import com.typesafe.config.Config @@ -21,10 +19,9 @@ import akka.dispatch._ import akka.event.Logging.Error import akka.pattern.ask import akka.testkit._ -import akka.util.Helpers.ConfigOps import akka.util.Switch import scala.concurrent.duration._ -import scala.concurrent.{ Await, Future, Promise } +import scala.concurrent.{ Await, Future } import scala.annotation.tailrec object ActorModelSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/BalancingDispatcherSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/BalancingDispatcherSpec.scala index 78ba40643e..b056f3c046 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/BalancingDispatcherSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/BalancingDispatcherSpec.scala @@ -2,9 +2,6 @@ package akka.actor.dispatch import java.util.concurrent.{ TimeUnit, CountDownLatch } -import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner - import akka.actor.{ Props, ActorRefWithCell, ActorCell, Actor } import akka.dispatch.Mailbox import akka.testkit.AkkaSpec diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala index f30c9ad119..f6c701c072 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala @@ -3,13 +3,12 @@ package akka.actor.dispatch import language.postfixOps import java.util.concurrent.{ CountDownLatch, TimeUnit } -import java.util.concurrent.atomic.{ AtomicBoolean, AtomicInteger } -import akka.testkit.{ filterEvents, EventFilter, AkkaSpec } +import java.util.concurrent.atomic.{ AtomicBoolean } +import akka.testkit.{ AkkaSpec } import akka.actor.{ Props, Actor } import scala.concurrent.Await import scala.concurrent.duration._ import akka.testkit.DefaultTimeout -import akka.dispatch.{ PinnedDispatcher, Dispatchers, Dispatcher } import akka.pattern.ask object DispatcherActorSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/PinnedActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/PinnedActorSpec.scala index 0eff5ae7b6..53408eb693 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/PinnedActorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/PinnedActorSpec.scala @@ -6,7 +6,6 @@ import akka.testkit._ import akka.actor.{ Props, Actor } import akka.testkit.AkkaSpec import org.scalatest.BeforeAndAfterEach -import akka.dispatch.{ PinnedDispatcher, Dispatchers } import scala.concurrent.Await import akka.pattern.ask diff --git a/akka-actor-tests/src/test/scala/akka/actor/routing/ListenerSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/routing/ListenerSpec.scala index e84f527376..a0f614abce 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/routing/ListenerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/routing/ListenerSpec.scala @@ -2,7 +2,6 @@ package akka.actor.routing import akka.testkit._ import akka.actor._ -import akka.actor.Actor._ import akka.routing._ import java.util.concurrent.atomic.AtomicInteger import scala.concurrent.Await diff --git a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala b/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala index 503e9963ca..c7dd0c39da 100644 --- a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala @@ -12,7 +12,6 @@ import akka.testkit.AkkaSpec import com.typesafe.config.ConfigFactory import scala.concurrent.duration._ -import scala.language.postfixOps import akka.event.DefaultLoggingFilter @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala index 5765d67bb8..4ea8862813 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala @@ -6,7 +6,6 @@ import scala.concurrent._ import scala.concurrent.duration._ import akka.testkit.{ TestLatch, AkkaSpec, DefaultTimeout } import akka.util.SerializedSuspendableExecutionContext -import akka.dispatch.ExecutionContexts.sameThreadExecutionContext import akka.testkit.TestActorRef import akka.actor.Props import akka.actor.Actor diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/ForkJoinPoolStarvationSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/ForkJoinPoolStarvationSpec.scala index e3e0d48880..0299328f8f 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/ForkJoinPoolStarvationSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/ForkJoinPoolStarvationSpec.scala @@ -1,6 +1,6 @@ package akka.dispatch -import akka.actor.{ ActorRef, Actor, Props } +import akka.actor.{ Actor, Props } import akka.testkit.{ ImplicitSender, AkkaSpec } import com.typesafe.config.ConfigFactory diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala index 915f8ea208..ec0414430f 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala @@ -2,12 +2,9 @@ package akka.dispatch import language.postfixOps -import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner import com.typesafe.config.Config import akka.actor.{ Props, ActorSystem, Actor } -import akka.pattern.ask import akka.testkit.{ DefaultTimeout, AkkaSpec } import scala.concurrent.duration._ diff --git a/akka-actor-tests/src/test/scala/akka/event/AddressTerminatedTopicBenchSpec.scala b/akka-actor-tests/src/test/scala/akka/event/AddressTerminatedTopicBenchSpec.scala index 3f08e26be4..7e4a1a8d4f 100644 --- a/akka-actor-tests/src/test/scala/akka/event/AddressTerminatedTopicBenchSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/event/AddressTerminatedTopicBenchSpec.scala @@ -7,7 +7,6 @@ import scala.concurrent.duration._ import akka.actor.Actor import akka.actor.ActorRef import akka.actor.ActorSystem -import akka.actor.Address import akka.actor.Props import akka.testkit._ diff --git a/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala b/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala index 5b13229e38..7ae6d69b8d 100644 --- a/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala @@ -9,12 +9,10 @@ import language.postfixOps import org.scalatest.BeforeAndAfterEach import akka.testkit._ import scala.concurrent.duration._ -import java.util.concurrent.atomic._ -import akka.actor.{ Props, Actor, ActorRef, ActorSystem, PoisonPill, RootActorPath } -import akka.japi.{ Procedure, Function } +import akka.actor.{ Props, Actor, ActorRef, ActorSystem, PoisonPill} +import akka.japi.{ Procedure} import com.typesafe.config.{ Config, ConfigFactory } -import scala.concurrent.Await object EventBusSpec { class TestActorWrapperActor(testActor: ActorRef) extends Actor { @@ -26,7 +24,6 @@ object EventBusSpec { @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) abstract class EventBusSpec(busName: String, conf: Config = ConfigFactory.empty()) extends AkkaSpec(conf) with BeforeAndAfterEach { - import EventBusSpec._ type BusType <: EventBus def createNewEventBus(): BusType diff --git a/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala b/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala index 25eeca2eb4..b65c4b69a4 100644 --- a/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala @@ -8,10 +8,7 @@ import language.postfixOps import scala.concurrent.duration._ import akka.actor._ import com.typesafe.config.ConfigFactory -import scala.collection.JavaConverters._ -import akka.event.Logging.InitializeLogger -import akka.pattern.gracefulStop -import akka.testkit.{ EventFilter, TestEvent, TestProbe, AkkaSpec } +import akka.testkit.{ TestProbe, AkkaSpec } object EventStreamSpec { diff --git a/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpec.scala b/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpec.scala index dd69ef9dcb..50ab314c86 100644 --- a/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpec.scala @@ -7,7 +7,6 @@ package akka.io import akka.actor.{ ActorRef, PoisonPill } import akka.io.Tcp._ import akka.testkit.{ TestProbe, AkkaSpec } -import akka.testkit.SocketUtil._ import akka.util.ByteString import java.io.IOException import java.net.{ ServerSocket, InetSocketAddress } diff --git a/akka-actor-tests/src/test/scala/akka/io/UdpIntegrationSpec.scala b/akka-actor-tests/src/test/scala/akka/io/UdpIntegrationSpec.scala index c707b12b79..4cda4b1996 100644 --- a/akka-actor-tests/src/test/scala/akka/io/UdpIntegrationSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/UdpIntegrationSpec.scala @@ -4,7 +4,6 @@ package akka.io import java.net.InetSocketAddress -import java.nio.channels.DatagramChannel import akka.testkit.{ TestProbe, ImplicitSender, AkkaSpec } import akka.util.ByteString import akka.actor.ActorRef diff --git a/akka-actor-tests/src/test/scala/akka/pattern/BackoffOnRestartSupervisorSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/BackoffOnRestartSupervisorSpec.scala index eb612e7a6e..9fc91adef8 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/BackoffOnRestartSupervisorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/BackoffOnRestartSupervisorSpec.scala @@ -8,7 +8,6 @@ import java.util.concurrent.{ TimeUnit, CountDownLatch } import akka.pattern.TestActor.NormalException import akka.testkit.{ ImplicitSender, AkkaSpec, TestProbe, filterException } -import scala.concurrent.Future import scala.concurrent.duration._ import akka.actor._ import scala.language.postfixOps @@ -21,7 +20,6 @@ object TestActor { } class TestActor(probe: ActorRef) extends Actor { - import context.dispatcher probe ! "STARTED" diff --git a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala index d0e5c59a1e..0c2c46ee64 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala @@ -7,7 +7,6 @@ import akka.testkit._ import scala.collection.immutable import scala.concurrent.duration._ import scala.concurrent.{ Future, Await } -import scala.annotation.tailrec class CircuitBreakerMTSpec extends AkkaSpec { implicit val ec = system.dispatcher diff --git a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala index d6f98f0d01..6c6f1b998d 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala @@ -10,7 +10,7 @@ import scala.concurrent.duration._ import scala.concurrent.TimeoutException import akka.testkit._ import org.scalatest.BeforeAndAfter -import akka.actor.{ ActorSystem, Scheduler } +import akka.actor.{ ActorSystem } import scala.concurrent.{ ExecutionContext, Future, Await } object CircuitBreakerSpec { diff --git a/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala index 1881a9eb4e..f15aeecea1 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala @@ -8,7 +8,6 @@ import language.postfixOps import akka.testkit.{ TestLatch, AkkaSpec } import akka.actor.{ Props, Actor } -import java.util.concurrent.TimeoutException import scala.concurrent.{ Future, Promise, Await } import scala.concurrent.duration._ diff --git a/akka-actor-tests/src/test/scala/akka/routing/BalancingSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/BalancingSpec.scala index 18b0fcf4d6..4f067273c5 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/BalancingSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/BalancingSpec.scala @@ -3,7 +3,6 @@ */ package akka.routing -import language.postfixOps import java.util.concurrent.atomic.AtomicInteger import scala.concurrent.Await import scala.concurrent.duration._ diff --git a/akka-actor-tests/src/test/scala/akka/routing/BroadcastSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/BroadcastSpec.scala index d86ac777c9..fc6a8d3bec 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/BroadcastSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/BroadcastSpec.scala @@ -5,7 +5,6 @@ package akka.routing import java.util.concurrent.atomic.AtomicInteger import scala.concurrent.Await -import scala.concurrent.duration._ import akka.actor.{ Props, Actor } import akka.testkit.{ TestLatch, ImplicitSender, DefaultTimeout, AkkaSpec } import akka.pattern.ask @@ -18,7 +17,6 @@ object BroadcastSpec { @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class BroadcastSpec extends AkkaSpec with DefaultTimeout with ImplicitSender { - import BroadcastSpec._ "broadcast group" must { diff --git a/akka-actor-tests/src/test/scala/akka/routing/MetricsBasedResizerSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/MetricsBasedResizerSpec.scala index 1f141dde99..b89d41a791 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/MetricsBasedResizerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/MetricsBasedResizerSpec.scala @@ -21,7 +21,6 @@ import akka.pattern.ask object MetricsBasedResizerSpec { class TestLatchingActor(implicit timeout: Timeout) extends Actor { - import context.system def receive = { case latch: TestLatch ⇒ diff --git a/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala index 0b955b280c..dd380e390f 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala @@ -12,7 +12,6 @@ import akka.testkit.TestEvent._ import scala.concurrent.Await import scala.concurrent.duration._ import akka.pattern.ask -import scala.util.Try object ResizerSpec { diff --git a/akka-actor-tests/src/test/scala/akka/routing/RouteeCreationSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/RouteeCreationSpec.scala index 2447528ef0..f3e0207f17 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/RouteeCreationSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/RouteeCreationSpec.scala @@ -7,8 +7,6 @@ package akka.routing import akka.testkit.AkkaSpec import akka.actor.Props import akka.actor.Actor -import akka.actor.ActorRef -import akka.actor.LocalActorRef import scala.concurrent.duration._ import akka.actor.Identify import akka.actor.ActorIdentity diff --git a/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala index b74974a71a..645728fae3 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala @@ -13,13 +13,6 @@ import scala.concurrent.Await import akka.ConfigurationException import com.typesafe.config.ConfigFactory import akka.pattern.{ ask, pipe } -import java.util.concurrent.ConcurrentHashMap -import com.typesafe.config.Config -import akka.dispatch.Dispatchers -import akka.util.Collections.EmptyImmutableSeq -import akka.util.Timeout -import java.util.concurrent.atomic.AtomicInteger -import akka.routing._ object RoutingSpec { diff --git a/akka-actor-tests/src/test/scala/akka/routing/SmallestMailboxSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/SmallestMailboxSpec.scala index c114f571ba..d14b25099d 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/SmallestMailboxSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/SmallestMailboxSpec.scala @@ -5,7 +5,6 @@ package akka.routing import java.util.concurrent.ConcurrentHashMap import scala.concurrent.Await -import scala.concurrent.duration._ import akka.actor.{ Props, Actor } import akka.testkit.{ TestLatch, ImplicitSender, DefaultTimeout, AkkaSpec } diff --git a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala b/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala index 0eacfffc23..84715f5e0e 100644 --- a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala @@ -318,7 +318,6 @@ class ReferenceSerializationSpec extends AkkaSpec(SerializationTests.mostlyRefer @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class SerializationCompatibilitySpec extends AkkaSpec(SerializationTests.mostlyReferenceSystem) { - import SerializationTests._ val ser = SerializationExtension(system) diff --git a/akka-actor-tests/src/test/scala/akka/testkit/CallingThreadDispatcherModelSpec.scala b/akka-actor-tests/src/test/scala/akka/testkit/CallingThreadDispatcherModelSpec.scala index 3b83a86ce3..7069a3337c 100644 --- a/akka-actor-tests/src/test/scala/akka/testkit/CallingThreadDispatcherModelSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/testkit/CallingThreadDispatcherModelSpec.scala @@ -9,7 +9,6 @@ import com.typesafe.config.Config import akka.dispatch.DispatcherPrerequisites import akka.dispatch.MessageDispatcher import akka.dispatch.MessageDispatcherConfigurator -import akka.dispatch.UnboundedMailbox object CallingThreadDispatcherModelSpec { import ActorModelSpec._ diff --git a/akka-actor/src/main/scala/akka/actor/AbstractProps.scala b/akka-actor/src/main/scala/akka/actor/AbstractProps.scala index 0c0c7a5ad2..7e11c88761 100644 --- a/akka-actor/src/main/scala/akka/actor/AbstractProps.scala +++ b/akka-actor/src/main/scala/akka/actor/AbstractProps.scala @@ -6,15 +6,11 @@ package akka.actor import java.lang.reflect.{ Modifier, ParameterizedType, TypeVariable } -import akka.dispatch._ import akka.japi.Creator -import akka.routing._ import akka.util.Reflect import scala.annotation.varargs import scala.language.existentials -import scala.reflect.ClassTag -import akka.japi.Util.immutableSeq /** * diff --git a/akka-actor/src/main/scala/akka/actor/ActorDSL.scala b/akka-actor/src/main/scala/akka/actor/ActorDSL.scala index d7b18fe0e7..fd202f3b2a 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorDSL.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorDSL.scala @@ -4,16 +4,10 @@ package akka.actor -import scala.collection.mutable.Queue import scala.concurrent.duration._ import akka.pattern.ask import scala.concurrent.Await -import akka.util.Timeout import akka.util.Helpers.ConfigOps -import scala.collection.immutable.TreeSet -import java.util.concurrent.TimeoutException -import java.util.concurrent.atomic.AtomicInteger -import java.util.concurrent.TimeUnit /** * This object contains elements which make writing actors and related code diff --git a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala index 3e31302c13..2dc6aed149 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala @@ -8,13 +8,12 @@ import akka.dispatch.sysmsg._ import akka.dispatch.{ UnboundedMessageQueueSemantics, RequiresMessageQueue } import akka.routing._ import akka.event._ -import akka.util.{ Switch, Helpers } +import akka.util.{ Helpers } import akka.japi.Util.immutableSeq import akka.util.Collections.EmptyImmutableSeq -import scala.util.{ Success, Failure } import scala.util.control.NonFatal import java.util.concurrent.atomic.AtomicLong -import scala.concurrent.{ ExecutionContext, ExecutionContextExecutor, Future, Promise } +import scala.concurrent.{ ExecutionContextExecutor, Future, Promise } import scala.annotation.implicitNotFound import akka.ConfigurationException import akka.dispatch.Mailboxes diff --git a/akka-actor/src/main/scala/akka/actor/ActorSelection.scala b/akka-actor/src/main/scala/akka/actor/ActorSelection.scala index e86d63d580..278bcf0d43 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorSelection.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorSelection.scala @@ -10,7 +10,6 @@ import scala.concurrent.Future import scala.concurrent.Promise import scala.concurrent.duration._ import scala.util.Success -import scala.util.Failure import java.util.regex.Pattern import akka.pattern.ask import akka.routing.MurmurHash diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala index f747c2b84b..827fc44abc 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala @@ -5,19 +5,17 @@ package akka.actor import java.io.Closeable -import java.util.concurrent.{ ConcurrentHashMap, ThreadFactory, CountDownLatch, TimeoutException, RejectedExecutionException } +import java.util.concurrent.{ ConcurrentHashMap, ThreadFactory, CountDownLatch, RejectedExecutionException } import java.util.concurrent.atomic.{ AtomicReference } -import java.util.concurrent.TimeUnit.MILLISECONDS import com.typesafe.config.{ Config, ConfigFactory } import akka.event._ import akka.dispatch._ -import akka.dispatch.sysmsg.{ SystemMessageList, EarliestFirstSystemMessageList, LatestFirstSystemMessageList, SystemMessage } import akka.japi.Util.immutableSeq import akka.actor.dungeon.ChildrenContainer import akka.util._ import scala.annotation.tailrec import scala.collection.immutable -import scala.concurrent.duration.{ FiniteDuration, Duration } +import scala.concurrent.duration.{ Duration } import scala.concurrent.{ Await, Future, Promise, ExecutionContext, ExecutionContextExecutor } import scala.util.{ Failure, Success, Try } import scala.util.control.{ NonFatal, ControlThrowable } @@ -163,7 +161,6 @@ object ActorSystem { config } - import scala.collection.JavaConverters._ import akka.util.Helpers.ConfigOps import config._ diff --git a/akka-actor/src/main/scala/akka/actor/LightArrayRevolverScheduler.scala b/akka-actor/src/main/scala/akka/actor/LightArrayRevolverScheduler.scala index b126dde816..aa723adb32 100644 --- a/akka-actor/src/main/scala/akka/actor/LightArrayRevolverScheduler.scala +++ b/akka-actor/src/main/scala/akka/actor/LightArrayRevolverScheduler.scala @@ -6,12 +6,12 @@ package akka.actor import java.io.Closeable import java.util.concurrent.ThreadFactory -import java.util.concurrent.atomic.{ AtomicLong, AtomicReference, AtomicReferenceArray } +import java.util.concurrent.atomic.{ AtomicLong, AtomicReference } import scala.annotation.tailrec import scala.collection.immutable import scala.concurrent.{ Await, ExecutionContext, Future, Promise } import scala.concurrent.duration._ -import scala.util.control.{ NoStackTrace, NonFatal } +import scala.util.control.{ NonFatal } import com.typesafe.config.Config import akka.event.LoggingAdapter import akka.util.Helpers diff --git a/akka-actor/src/main/scala/akka/actor/Props.scala b/akka-actor/src/main/scala/akka/actor/Props.scala index ef380eac50..026ef7f19b 100644 --- a/akka-actor/src/main/scala/akka/actor/Props.scala +++ b/akka-actor/src/main/scala/akka/actor/Props.scala @@ -8,7 +8,6 @@ import akka.actor.Deploy.{ NoDispatcherGiven, NoMailboxGiven } import akka.dispatch._ import akka.routing._ -import scala.annotation.varargs import scala.collection.immutable import scala.language.existentials import scala.reflect.ClassTag diff --git a/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala b/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala index b7f154077d..311a1ab721 100644 --- a/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala +++ b/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala @@ -4,9 +4,7 @@ package akka.actor -import java.io.ObjectStreamException -import java.util.{ LinkedList ⇒ JLinkedList, ListIterator ⇒ JListIterator } -import java.util.concurrent.TimeUnit +import java.util.{ LinkedList ⇒ JLinkedList } import java.util.concurrent.locks.ReentrantLock import scala.annotation.tailrec @@ -17,7 +15,6 @@ import akka.event.Logging.Warning import akka.util.Unsafe import akka.dispatch._ import akka.dispatch.sysmsg._ -import util.Try /** * This actor ref starts out with some dummy cell (by default just enqueuing diff --git a/akka-actor/src/main/scala/akka/actor/Stash.scala b/akka-actor/src/main/scala/akka/actor/Stash.scala index 9531da412b..a0b954fdc4 100644 --- a/akka-actor/src/main/scala/akka/actor/Stash.scala +++ b/akka-actor/src/main/scala/akka/actor/Stash.scala @@ -6,7 +6,7 @@ package akka.actor import scala.collection.immutable import akka.AkkaException -import akka.dispatch.{ UnboundedDequeBasedMessageQueueSemantics, RequiresMessageQueue, Envelope, DequeBasedMessageQueueSemantics, Mailboxes } +import akka.dispatch.{ UnboundedDequeBasedMessageQueueSemantics, RequiresMessageQueue, Envelope, DequeBasedMessageQueueSemantics } import scala.util.control.NoStackTrace @@ -249,4 +249,4 @@ private[akka] trait StashSupport { /** * Is thrown when the size of the Stash exceeds the capacity of the Stash */ -class StashOverflowException(message: String, cause: Throwable = null) extends AkkaException(message, cause) with NoStackTrace \ No newline at end of file +class StashOverflowException(message: String, cause: Throwable = null) extends AkkaException(message, cause) with NoStackTrace diff --git a/akka-actor/src/main/scala/akka/actor/TypedActor.scala b/akka-actor/src/main/scala/akka/actor/TypedActor.scala index 9794674285..9ec9b2e0f3 100644 --- a/akka-actor/src/main/scala/akka/actor/TypedActor.scala +++ b/akka-actor/src/main/scala/akka/actor/TypedActor.scala @@ -9,7 +9,6 @@ import scala.util.control.NonFatal import scala.util.{ Try, Success, Failure } import scala.collection.immutable import scala.concurrent.duration.FiniteDuration -import scala.concurrent.duration.Duration import scala.reflect.ClassTag import scala.concurrent.{ Await, Future } import akka.japi.{ Creator, Option ⇒ JOption } @@ -20,7 +19,6 @@ import akka.serialization.{ JavaSerializer, SerializationExtension } import akka.dispatch._ import java.util.concurrent.atomic.{ AtomicReference ⇒ AtomVar } import java.util.concurrent.TimeoutException -import java.util.concurrent.TimeUnit.MILLISECONDS import java.io.ObjectStreamException import java.lang.reflect.{ InvocationTargetException, Method, InvocationHandler, Proxy } import akka.pattern.AskTimeoutException diff --git a/akka-actor/src/main/scala/akka/actor/UntypedActor.scala b/akka-actor/src/main/scala/akka/actor/UntypedActor.scala index 091487436e..608de1af44 100644 --- a/akka-actor/src/main/scala/akka/actor/UntypedActor.scala +++ b/akka-actor/src/main/scala/akka/actor/UntypedActor.scala @@ -4,8 +4,6 @@ package akka.actor -import akka.japi.{ Creator } - /** * Actor base trait that should be extended by or mixed to create an Actor with the semantics of the 'Actor Model': * http://en.wikipedia.org/wiki/Actor_model diff --git a/akka-actor/src/main/scala/akka/actor/dsl/Creators.scala b/akka-actor/src/main/scala/akka/actor/dsl/Creators.scala index 8298737462..e4789b4ffd 100644 --- a/akka-actor/src/main/scala/akka/actor/dsl/Creators.scala +++ b/akka-actor/src/main/scala/akka/actor/dsl/Creators.scala @@ -4,15 +4,7 @@ package akka.actor.dsl -import scala.concurrent.Await import akka.actor._ -import scala.collection.immutable.TreeSet -import scala.concurrent.duration._ -import scala.collection.mutable.Queue -import akka.util.Timeout -import java.util.concurrent.TimeoutException -import java.util.concurrent.atomic.AtomicInteger -import akka.pattern.ask import scala.reflect.ClassTag trait Creators { this: ActorDSL.type ⇒ diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/ChildrenContainer.scala b/akka-actor/src/main/scala/akka/actor/dungeon/ChildrenContainer.scala index d342aab044..e0b8826acf 100644 --- a/akka-actor/src/main/scala/akka/actor/dungeon/ChildrenContainer.scala +++ b/akka-actor/src/main/scala/akka/actor/dungeon/ChildrenContainer.scala @@ -7,7 +7,6 @@ package akka.actor.dungeon import scala.collection.immutable import akka.actor.{ InvalidActorNameException, ChildStats, ChildRestartStats, ChildNameReserved, ActorRef } -import akka.dispatch.sysmsg.{ EarliestFirstSystemMessageList, SystemMessageList, LatestFirstSystemMessageList, SystemMessage } import akka.util.Collections.{ EmptyImmutableSeq, PartialImmutableValuesIterable } /** diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala b/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala index e41befb6e3..d5a4e93844 100644 --- a/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala +++ b/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala @@ -5,7 +5,7 @@ package akka.actor.dungeon import scala.annotation.tailrec -import akka.dispatch.{ MessageDispatcher, Mailbox, Envelope } +import akka.dispatch.{ Mailbox, Envelope } import akka.dispatch.sysmsg._ import akka.event.Logging.Error import akka.util.Unsafe diff --git a/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala index 61812cd486..d79eed90fa 100644 --- a/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala +++ b/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala @@ -4,13 +4,13 @@ package akka.dispatch -import akka.actor.{ ActorCell, ActorRef } +import akka.actor.{ ActorCell } import akka.dispatch.sysmsg._ import scala.annotation.tailrec import scala.concurrent.duration.Duration import akka.util.Helpers import java.util.{ Comparator, Iterator } -import java.util.concurrent.{ Executor, LinkedBlockingQueue, ConcurrentLinkedQueue, ConcurrentSkipListSet } +import java.util.concurrent.{ ConcurrentSkipListSet } import akka.actor.ActorSystemImpl import scala.concurrent.duration.FiniteDuration diff --git a/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala index d6d4c89bd4..e5b97847fe 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala +++ b/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala @@ -8,14 +8,9 @@ import akka.event.Logging.Error import akka.actor.ActorCell import akka.event.Logging import akka.dispatch.sysmsg.SystemMessage -import java.util.concurrent.atomic.AtomicReference import java.util.concurrent.{ ExecutorService, RejectedExecutionException } -import scala.concurrent.forkjoin.ForkJoinPool import scala.concurrent.duration.Duration -import scala.concurrent.Awaitable import scala.concurrent.duration.FiniteDuration -import scala.annotation.tailrec -import java.lang.reflect.ParameterizedType /** * The event-based ``Dispatcher`` binds a set of Actors to a thread pool backed up by a diff --git a/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala b/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala index 6a7b7072a5..78ffa96527 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala +++ b/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala @@ -4,14 +4,12 @@ package akka.dispatch -import java.util.concurrent.{ ConcurrentHashMap, TimeUnit, ThreadFactory } +import java.util.concurrent.{ ConcurrentHashMap, ThreadFactory } import com.typesafe.config.{ ConfigFactory, Config } import akka.actor.{ Scheduler, DynamicAccess, ActorSystem } import akka.event.Logging.Warning import akka.event.EventStream -import scala.concurrent.duration.Duration import akka.ConfigurationException -import akka.actor.Deploy import akka.util.Helpers.ConfigOps import scala.concurrent.ExecutionContext diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala index a36cc17cba..d25c8251af 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Future.scala +++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala @@ -9,7 +9,7 @@ import akka.japi.{ Function ⇒ JFunc, Option ⇒ JOption, Procedure } import scala.concurrent.{ Future, Promise, ExecutionContext, ExecutionContextExecutor, ExecutionContextExecutorService } import java.lang.{ Iterable ⇒ JIterable } import java.util.{ LinkedList ⇒ JLinkedList } -import java.util.concurrent.{ Executor, ExecutorService, ExecutionException, Callable, TimeoutException } +import java.util.concurrent.{ Executor, ExecutorService, Callable} import scala.util.{ Try, Success, Failure } import java.util.concurrent.CompletionStage import java.util.concurrent.CompletableFuture diff --git a/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala b/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala index 50ff04adb7..ce88a4340d 100644 --- a/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala +++ b/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala @@ -5,7 +5,7 @@ package akka.dispatch import java.util.Collection -import scala.concurrent.{ Awaitable, BlockContext, CanAwait } +import scala.concurrent.{ BlockContext, CanAwait } import scala.concurrent.duration.Duration import scala.concurrent.forkjoin._ import java.util.concurrent.{ diff --git a/akka-actor/src/main/scala/akka/event/EventBus.scala b/akka-actor/src/main/scala/akka/event/EventBus.scala index a4a3863392..62087bd79c 100644 --- a/akka-actor/src/main/scala/akka/event/EventBus.scala +++ b/akka-actor/src/main/scala/akka/event/EventBus.scala @@ -10,7 +10,7 @@ import java.util.concurrent.ConcurrentSkipListSet import java.util.Comparator import akka.util.{ Subclassification, SubclassifiedIndex } import scala.collection.immutable -import java.util.concurrent.atomic.{ AtomicReference, AtomicInteger } +import java.util.concurrent.atomic.{ AtomicReference } /** * Represents the base type for EventBuses diff --git a/akka-actor/src/main/scala/akka/io/IO.scala b/akka-actor/src/main/scala/akka/io/IO.scala index a38061a0d9..e7a4255098 100644 --- a/akka-actor/src/main/scala/akka/io/IO.scala +++ b/akka-actor/src/main/scala/akka/io/IO.scala @@ -4,10 +4,7 @@ package akka.io -import scala.util.control.NonFatal import akka.actor._ -import akka.io.SelectionHandler.WorkerForCommand -import akka.event.Logging /** * Entry point to Akka’s IO layer. @@ -28,4 +25,4 @@ object IO { */ def apply[T <: Extension](key: ExtensionId[T])(implicit system: ActorSystem): ActorRef = key(system).manager -} \ No newline at end of file +} diff --git a/akka-actor/src/main/scala/akka/io/Inet.scala b/akka-actor/src/main/scala/akka/io/Inet.scala index f79a4f2bae..d73f923a01 100644 --- a/akka-actor/src/main/scala/akka/io/Inet.scala +++ b/akka-actor/src/main/scala/akka/io/Inet.scala @@ -3,7 +3,7 @@ */ package akka.io -import java.nio.channels.{ DatagramChannel, SocketChannel, ServerSocketChannel } +import java.nio.channels.{ DatagramChannel } import java.net.DatagramSocket import java.net.ServerSocket import java.net.Socket diff --git a/akka-actor/src/main/scala/akka/io/Tcp.scala b/akka-actor/src/main/scala/akka/io/Tcp.scala index d4d1933d5b..d8f42f721e 100644 --- a/akka-actor/src/main/scala/akka/io/Tcp.scala +++ b/akka-actor/src/main/scala/akka/io/Tcp.scala @@ -6,7 +6,6 @@ package akka.io import java.net.InetSocketAddress import java.net.Socket -import akka.ConfigurationException import akka.io.Inet._ import com.typesafe.config.Config import scala.concurrent.duration._ diff --git a/akka-actor/src/main/scala/akka/io/TcpOutgoingConnection.scala b/akka-actor/src/main/scala/akka/io/TcpOutgoingConnection.scala index 5e5aa08187..e6fce9c7f0 100644 --- a/akka-actor/src/main/scala/akka/io/TcpOutgoingConnection.scala +++ b/akka-actor/src/main/scala/akka/io/TcpOutgoingConnection.scala @@ -7,10 +7,8 @@ package akka.io import java.net.InetSocketAddress import java.nio.channels.{ SelectionKey, SocketChannel } import scala.util.control.NonFatal -import scala.collection.immutable import scala.concurrent.duration._ import akka.actor.{ ReceiveTimeout, ActorRef } -import akka.io.Inet.SocketOption import akka.io.TcpConnection.CloseInformation import akka.io.SelectionHandler._ import akka.io.Tcp._ diff --git a/akka-actor/src/main/scala/akka/io/Udp.scala b/akka-actor/src/main/scala/akka/io/Udp.scala index 252afa3844..035cd315ff 100644 --- a/akka-actor/src/main/scala/akka/io/Udp.scala +++ b/akka-actor/src/main/scala/akka/io/Udp.scala @@ -235,7 +235,6 @@ object UdpMessage { import Udp._ import java.lang.{ Iterable ⇒ JIterable } import scala.collection.JavaConverters._ - import language.implicitConversions /** * Each [[Udp.Send]] can optionally request a positive acknowledgment to be sent diff --git a/akka-actor/src/main/scala/akka/io/UdpListener.scala b/akka-actor/src/main/scala/akka/io/UdpListener.scala index 0a7bc02662..239f572f9f 100644 --- a/akka-actor/src/main/scala/akka/io/UdpListener.scala +++ b/akka-actor/src/main/scala/akka/io/UdpListener.scala @@ -5,7 +5,6 @@ package akka.io import java.net.InetSocketAddress import java.nio.ByteBuffer -import java.nio.channels.DatagramChannel import java.nio.channels.SelectionKey._ import scala.annotation.tailrec import scala.util.control.NonFatal diff --git a/akka-actor/src/main/scala/akka/pattern/BackoffOptions.scala b/akka-actor/src/main/scala/akka/pattern/BackoffOptions.scala index 13a09776ca..36a5dca998 100644 --- a/akka-actor/src/main/scala/akka/pattern/BackoffOptions.scala +++ b/akka-actor/src/main/scala/akka/pattern/BackoffOptions.scala @@ -5,7 +5,6 @@ package akka.pattern import scala.concurrent.duration.{ Duration, FiniteDuration } import akka.actor.{ Props, OneForOneStrategy, SupervisorStrategy } -import akka.actor.SupervisorStrategy.{ Decider, JDecider } /** * Builds back-off options for creating a back-off supervisor. diff --git a/akka-actor/src/main/scala/akka/pattern/BackoffSupervisor.scala b/akka-actor/src/main/scala/akka/pattern/BackoffSupervisor.scala index 04dcb129ec..aa19dd0d1f 100644 --- a/akka-actor/src/main/scala/akka/pattern/BackoffSupervisor.scala +++ b/akka-actor/src/main/scala/akka/pattern/BackoffSupervisor.scala @@ -12,7 +12,6 @@ import akka.actor.ActorRef import akka.actor.DeadLetterSuppression import akka.actor.Props import akka.actor.Terminated -import akka.actor.SupervisorStrategy.Decider import akka.actor.SupervisorStrategy.Directive import akka.actor.SupervisorStrategy.Escalate import akka.actor.OneForOneStrategy @@ -273,4 +272,4 @@ private[akka] trait HandleBackoff { this: Actor ⇒ case None ⇒ context.system.deadLetters.forward(msg) } } -} \ No newline at end of file +} diff --git a/akka-actor/src/main/scala/akka/pattern/FutureTimeoutSupport.scala b/akka-actor/src/main/scala/akka/pattern/FutureTimeoutSupport.scala index f4c4e791d7..44f926c990 100644 --- a/akka-actor/src/main/scala/akka/pattern/FutureTimeoutSupport.scala +++ b/akka-actor/src/main/scala/akka/pattern/FutureTimeoutSupport.scala @@ -3,7 +3,6 @@ */ package akka.pattern -import scala.concurrent.duration.Duration import scala.concurrent.{ ExecutionContext, Promise, Future } import akka.actor._ import scala.util.control.NonFatal diff --git a/akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala b/akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala index 8636cb8a20..b1d27fc95b 100644 --- a/akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala +++ b/akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala @@ -8,8 +8,6 @@ import akka.actor._ import akka.util.{ Timeout } import akka.dispatch.sysmsg.{ Unwatch, Watch } import scala.concurrent.Future -import scala.concurrent.duration.Duration -import scala.util.Success import scala.concurrent.duration.FiniteDuration trait GracefulStopSupport { diff --git a/akka-actor/src/main/scala/akka/pattern/Patterns.scala b/akka-actor/src/main/scala/akka/pattern/Patterns.scala index 4e6b59363b..de226c92fe 100644 --- a/akka-actor/src/main/scala/akka/pattern/Patterns.scala +++ b/akka-actor/src/main/scala/akka/pattern/Patterns.scala @@ -12,7 +12,7 @@ import scala.compat.java8.FutureConverters._ object Patterns { import akka.japi - import akka.actor.{ ActorRef, ActorSystem } + import akka.actor.{ ActorRef } import akka.pattern.{ ask ⇒ scalaAsk, pipe ⇒ scalaPipe, gracefulStop ⇒ scalaGracefulStop, after ⇒ scalaAfter } import akka.util.Timeout import scala.concurrent.Future @@ -261,10 +261,9 @@ object Patterns { object PatternsCS { import akka.japi - import akka.actor.{ ActorRef, ActorSystem } - import akka.pattern.{ ask ⇒ scalaAsk, pipe ⇒ scalaPipe, gracefulStop ⇒ scalaGracefulStop, after ⇒ scalaAfter } + import akka.actor.{ ActorRef } + import akka.pattern.{ ask ⇒ scalaAsk, gracefulStop ⇒ scalaGracefulStop } import akka.util.Timeout - import scala.concurrent.Future import scala.concurrent.duration._ /** diff --git a/akka-actor/src/main/scala/akka/pattern/PromiseRef.scala b/akka-actor/src/main/scala/akka/pattern/PromiseRef.scala index 9fffb262d0..e3ae298ada 100644 --- a/akka-actor/src/main/scala/akka/pattern/PromiseRef.scala +++ b/akka-actor/src/main/scala/akka/pattern/PromiseRef.scala @@ -7,7 +7,6 @@ import akka.actor._ import akka.util.Timeout import scala.concurrent.{ Future, Promise } -import scala.language.implicitConversions /** * A combination of a Future and an ActorRef associated with it, which points diff --git a/akka-actor/src/main/scala/akka/pattern/extended/package.scala b/akka-actor/src/main/scala/akka/pattern/extended/package.scala index 64e2cf2eea..04b0e4d80d 100644 --- a/akka-actor/src/main/scala/akka/pattern/extended/package.scala +++ b/akka-actor/src/main/scala/akka/pattern/extended/package.scala @@ -4,8 +4,6 @@ package akka package pattern -import akka.actor._ - /** * == Extended Versions Of Akka Patterns == * diff --git a/akka-actor/src/main/scala/akka/pattern/package.scala b/akka-actor/src/main/scala/akka/pattern/package.scala index 6828a91609..0658ebdcaf 100644 --- a/akka-actor/src/main/scala/akka/pattern/package.scala +++ b/akka-actor/src/main/scala/akka/pattern/package.scala @@ -3,8 +3,6 @@ */ package akka -import akka.actor._ - /** * == Commonly Used Patterns With Akka == * diff --git a/akka-actor/src/main/scala/akka/routing/Broadcast.scala b/akka-actor/src/main/scala/akka/routing/Broadcast.scala index 58605dc7df..fbc54e4af2 100644 --- a/akka-actor/src/main/scala/akka/routing/Broadcast.scala +++ b/akka-actor/src/main/scala/akka/routing/Broadcast.scala @@ -4,8 +4,6 @@ package akka.routing import scala.collection.immutable -import akka.actor.ActorContext -import akka.actor.Props import akka.dispatch.Dispatchers import com.typesafe.config.Config import akka.actor.SupervisorStrategy diff --git a/akka-actor/src/main/scala/akka/routing/ConsistentHashing.scala b/akka-actor/src/main/scala/akka/routing/ConsistentHashing.scala index c8a5ef2d0c..1139fc1051 100644 --- a/akka-actor/src/main/scala/akka/routing/ConsistentHashing.scala +++ b/akka-actor/src/main/scala/akka/routing/ConsistentHashing.scala @@ -4,8 +4,6 @@ package akka.routing import scala.collection.immutable -import akka.actor.ActorContext -import akka.actor.Props import akka.dispatch.Dispatchers import com.typesafe.config.Config import akka.actor.SupervisorStrategy @@ -14,7 +12,6 @@ import akka.actor.Address import akka.actor.ExtendedActorSystem import akka.actor.ActorSystem import java.util.concurrent.atomic.AtomicReference -import akka.actor.ActorRef import akka.serialization.SerializationExtension import scala.util.control.NonFatal import akka.event.Logging diff --git a/akka-actor/src/main/scala/akka/routing/Random.scala b/akka-actor/src/main/scala/akka/routing/Random.scala index 04afaa16f6..7984033f93 100644 --- a/akka-actor/src/main/scala/akka/routing/Random.scala +++ b/akka-actor/src/main/scala/akka/routing/Random.scala @@ -5,8 +5,6 @@ package akka.routing import scala.collection.immutable import java.util.concurrent.ThreadLocalRandom -import akka.actor.ActorContext -import akka.actor.Props import akka.dispatch.Dispatchers import com.typesafe.config.Config import akka.actor.SupervisorStrategy diff --git a/akka-actor/src/main/scala/akka/routing/Resizer.scala b/akka-actor/src/main/scala/akka/routing/Resizer.scala index a73a8ccf37..cb10d0496e 100644 --- a/akka-actor/src/main/scala/akka/routing/Resizer.scala +++ b/akka-actor/src/main/scala/akka/routing/Resizer.scala @@ -3,16 +3,12 @@ */ package akka.routing -import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.atomic.AtomicLong import akka.AkkaException -import akka.event.Logging.Error.NoCause import scala.collection.immutable -import scala.concurrent.duration._ -import scala.concurrent.duration.FiniteDuration import com.typesafe.config.Config @@ -22,12 +18,10 @@ import akka.actor.ActorInitializationException import akka.actor.ActorRefWithCell import akka.actor.ActorSystemImpl import akka.actor.InternalActorRef -import akka.actor.PoisonPill import akka.actor.Props import akka.actor.SupervisorStrategy import akka.dispatch.Envelope import akka.dispatch.MessageDispatcher -import java.lang.{ Double ⇒ JDouble } /** * [[Pool]] routers with dynamically resizable number of routees are implemented by providing a Resizer diff --git a/akka-actor/src/main/scala/akka/routing/RoutedActorRef.scala b/akka-actor/src/main/scala/akka/routing/RoutedActorRef.scala index ab12b4d854..4cfade0d27 100644 --- a/akka-actor/src/main/scala/akka/routing/RoutedActorRef.scala +++ b/akka-actor/src/main/scala/akka/routing/RoutedActorRef.scala @@ -3,7 +3,6 @@ */ package akka.routing -import scala.concurrent.duration._ import akka.ConfigurationException import akka.actor.ActorPath import akka.actor.ActorSystemImpl diff --git a/akka-actor/src/main/scala/akka/routing/RouterConfig.scala b/akka-actor/src/main/scala/akka/routing/RouterConfig.scala index 651c647c6c..347493d283 100644 --- a/akka-actor/src/main/scala/akka/routing/RouterConfig.scala +++ b/akka-actor/src/main/scala/akka/routing/RouterConfig.scala @@ -3,11 +3,9 @@ */ package akka.routing -import akka.util.Collections.EmptyImmutableSeq import scala.collection.immutable import akka.ConfigurationException -import akka.actor.Actor import akka.actor.ActorContext import akka.actor.ActorPath import akka.actor.AutoReceivedMessage diff --git a/akka-actor/src/main/scala/akka/routing/ScatterGatherFirstCompleted.scala b/akka-actor/src/main/scala/akka/routing/ScatterGatherFirstCompleted.scala index 51f3d57cca..0a79e3f477 100644 --- a/akka-actor/src/main/scala/akka/routing/ScatterGatherFirstCompleted.scala +++ b/akka-actor/src/main/scala/akka/routing/ScatterGatherFirstCompleted.scala @@ -4,8 +4,6 @@ package akka.routing import scala.collection.immutable -import akka.actor.ActorContext -import akka.actor.Props import akka.dispatch.Dispatchers import com.typesafe.config.Config import akka.actor.SupervisorStrategy @@ -19,7 +17,6 @@ import scala.concurrent.duration.FiniteDuration import scala.concurrent.duration._ import akka.util.Timeout import akka.util.Helpers.ConfigOps -import java.util.concurrent.TimeUnit import akka.actor.ActorSystem import scala.concurrent.Future import java.util.concurrent.TimeoutException diff --git a/akka-actor/src/main/scala/akka/routing/SmallestMailbox.scala b/akka-actor/src/main/scala/akka/routing/SmallestMailbox.scala index 46d276590b..ae7c027010 100644 --- a/akka-actor/src/main/scala/akka/routing/SmallestMailbox.scala +++ b/akka-actor/src/main/scala/akka/routing/SmallestMailbox.scala @@ -11,9 +11,7 @@ import akka.actor.ActorCell import akka.actor.ActorRefWithCell import akka.actor.SupervisorStrategy import akka.dispatch.Dispatchers -import akka.japi.Util.immutableSeq import akka.actor.ActorSystem -import akka.actor.Props object SmallestMailboxRoutingLogic { def apply(): SmallestMailboxRoutingLogic = new SmallestMailboxRoutingLogic diff --git a/akka-actor/src/main/scala/akka/routing/TailChopping.scala b/akka-actor/src/main/scala/akka/routing/TailChopping.scala index 66147b5e5a..c2d5d59acc 100644 --- a/akka-actor/src/main/scala/akka/routing/TailChopping.scala +++ b/akka-actor/src/main/scala/akka/routing/TailChopping.scala @@ -11,7 +11,7 @@ import akka.dispatch.Dispatchers import com.typesafe.config.Config import akka.japi.Util.immutableSeq import scala.concurrent.{ ExecutionContext, Promise } -import akka.pattern.{ AskTimeoutException, after, ask, pipe } +import akka.pattern.{ AskTimeoutException, ask, pipe } import scala.concurrent.duration._ import akka.util.Timeout import akka.util.Helpers.ConfigOps diff --git a/akka-actor/src/main/scala/akka/serialization/Serializer.scala b/akka-actor/src/main/scala/akka/serialization/Serializer.scala index 3f0a5b6469..fa754c5d15 100644 --- a/akka-actor/src/main/scala/akka/serialization/Serializer.scala +++ b/akka-actor/src/main/scala/akka/serialization/Serializer.scala @@ -4,12 +4,11 @@ package akka.serialization * Copyright (C) 2009-2016 Lightbend Inc. */ -import java.io.{ ObjectOutputStream, ByteArrayOutputStream, ObjectInputStream, ByteArrayInputStream } +import java.io.{ ObjectOutputStream, ByteArrayOutputStream, ByteArrayInputStream } import java.util.concurrent.Callable import akka.util.ClassLoaderObjectInputStream import akka.actor.ExtendedActorSystem import scala.util.DynamicVariable -import akka.serialization.JavaSerializer.CurrentSystem /** * A Serializer represents a bimap between an object and an array of bytes representing that object. diff --git a/akka-actor/src/main/scala/akka/util/Index.scala b/akka-actor/src/main/scala/akka/util/Index.scala index acee0f5653..96e87cd633 100644 --- a/akka-actor/src/main/scala/akka/util/Index.scala +++ b/akka-actor/src/main/scala/akka/util/Index.scala @@ -8,7 +8,6 @@ import annotation.tailrec import java.util.concurrent.{ ConcurrentSkipListSet, ConcurrentHashMap } import java.util.Comparator import scala.collection.JavaConverters.{ asScalaIteratorConverter, collectionAsScalaIterableConverter } -import scala.collection.mutable /** * An implementation of a ConcurrentMultiMap diff --git a/akka-actor/src/main/scala/akka/util/LineNumbers.scala b/akka-actor/src/main/scala/akka/util/LineNumbers.scala index a2b920c15e..3aa1ea0af1 100644 --- a/akka-actor/src/main/scala/akka/util/LineNumbers.scala +++ b/akka-actor/src/main/scala/akka/util/LineNumbers.scala @@ -4,11 +4,9 @@ package akka.util import java.io.DataInputStream -import java.io.BufferedInputStream -import scala.annotation.{ switch, tailrec } +import scala.annotation.{ switch } import scala.util.control.NonFatal import java.io.InputStream -import scala.util.Try /** * This is a minimized byte-code parser that concentrates exclusively on line diff --git a/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala b/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala index 30358c3f76..d7b87f9581 100644 --- a/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala +++ b/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala @@ -3,7 +3,6 @@ */ package akka.util -import java.util.concurrent.ConcurrentLinkedQueue import java.util.concurrent.atomic.AtomicInteger import scala.concurrent.ExecutionContext import scala.util.control.NonFatal @@ -88,4 +87,4 @@ private[akka] final class SerializedSuspendableExecutionContext(throughput: Int) case 2 ⇒ "Off & Suspended" case 3 ⇒ "On & Suspended" } -} \ No newline at end of file +} diff --git a/akka-actor/src/main/scala/akka/util/Timeout.scala b/akka-actor/src/main/scala/akka/util/Timeout.scala index 066b4ef4d2..739f800072 100644 --- a/akka-actor/src/main/scala/akka/util/Timeout.scala +++ b/akka-actor/src/main/scala/akka/util/Timeout.scala @@ -7,7 +7,6 @@ package akka.util import language.implicitConversions import java.util.concurrent.TimeUnit -import java.lang.{ Double ⇒ JDouble } import scala.concurrent.duration.{ Duration, FiniteDuration } @SerialVersionUID(1L) diff --git a/akka-bench-jmh/src/main/scala/akka/cluster/ddata/ORSetMergeBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/cluster/ddata/ORSetMergeBenchmark.scala index 1ef28ea1aa..6c56afa12b 100644 --- a/akka-bench-jmh/src/main/scala/akka/cluster/ddata/ORSetMergeBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/cluster/ddata/ORSetMergeBenchmark.scala @@ -13,7 +13,6 @@ import org.openjdk.jmh.annotations.OutputTimeUnit import org.openjdk.jmh.annotations.{ Scope => JmhScope } import org.openjdk.jmh.annotations.State import org.openjdk.jmh.annotations.Warmup -import akka.actor.ActorPath import akka.cluster.UniqueAddress import akka.actor.Address import org.openjdk.jmh.annotations.Param diff --git a/akka-bench-jmh/src/main/scala/akka/cluster/ddata/VersionVectorBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/cluster/ddata/VersionVectorBenchmark.scala index 12294d63fc..4e75b8d7f1 100644 --- a/akka-bench-jmh/src/main/scala/akka/cluster/ddata/VersionVectorBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/cluster/ddata/VersionVectorBenchmark.scala @@ -13,13 +13,11 @@ import org.openjdk.jmh.annotations.OutputTimeUnit import org.openjdk.jmh.annotations.{ Scope => JmhScope } import org.openjdk.jmh.annotations.State import org.openjdk.jmh.annotations.Warmup -import akka.actor.ActorPath import akka.cluster.UniqueAddress import akka.actor.Address import org.openjdk.jmh.annotations.Param import org.openjdk.jmh.annotations.Setup import org.openjdk.jmh.annotations.Level -import scala.collection.immutable.TreeMap @Fork(2) @State(JmhScope.Benchmark) diff --git a/akka-bench-jmh/src/main/scala/akka/persistence/PersistenceActorDeferBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/persistence/PersistenceActorDeferBenchmark.scala index a1a5f0371d..517ce82528 100644 --- a/akka-bench-jmh/src/main/scala/akka/persistence/PersistenceActorDeferBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/persistence/PersistenceActorDeferBenchmark.scala @@ -5,8 +5,6 @@ package akka.persistence import scala.concurrent.duration._ import org.openjdk.jmh.annotations._ -import org.openjdk.jmh._ -import com.typesafe.config.ConfigFactory import akka.actor._ import akka.testkit.TestProbe import java.io.File diff --git a/akka-bench-jmh/src/main/scala/akka/persistence/PersistentActorBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/persistence/PersistentActorBenchmark.scala index dd1ef4371f..2d5d2395be 100644 --- a/akka-bench-jmh/src/main/scala/akka/persistence/PersistentActorBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/persistence/PersistentActorBenchmark.scala @@ -5,8 +5,6 @@ package akka.persistence import scala.concurrent.duration._ import org.openjdk.jmh.annotations._ -import org.openjdk.jmh._ -import com.typesafe.config.ConfigFactory import akka.actor._ import akka.testkit.TestProbe import java.io.File diff --git a/akka-bench-jmh/src/main/scala/akka/stream/InterpreterBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/InterpreterBenchmark.scala index 0ec9e9dee5..fe3580d6f7 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/InterpreterBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/InterpreterBenchmark.scala @@ -1,13 +1,12 @@ package akka.stream import akka.event._ -import akka.stream.impl.fusing.{ GraphInterpreterSpecKit, GraphStages, Map => MapStage } +import akka.stream.impl.fusing.{ GraphInterpreterSpecKit, GraphStages} import akka.stream.impl.fusing.GraphStages import akka.stream.impl.fusing.GraphInterpreter.{ DownstreamBoundaryStageLogic, UpstreamBoundaryStageLogic } import akka.stream.stage._ import org.openjdk.jmh.annotations._ -import scala.concurrent.Lock import java.util.concurrent.TimeUnit diff --git a/akka-camel/src/main/scala/akka/camel/Activation.scala b/akka-camel/src/main/scala/akka/camel/Activation.scala index 040580b0e6..303807fa9a 100644 --- a/akka-camel/src/main/scala/akka/camel/Activation.scala +++ b/akka-camel/src/main/scala/akka/camel/Activation.scala @@ -4,12 +4,9 @@ package akka.camel -import akka.camel.internal._ import akka.util.Timeout -import akka.actor.{ ActorSystem, Props, ActorRef } -import akka.pattern._ +import akka.actor.{ ActorRef } import scala.concurrent.{ ExecutionContext, Future } -import scala.concurrent.duration.{ Duration, FiniteDuration } /** * Activation trait that can be used to wait on activation or de-activation of Camel endpoints. diff --git a/akka-camel/src/main/scala/akka/camel/CamelSupport.scala b/akka-camel/src/main/scala/akka/camel/CamelSupport.scala index a2f0bc1faa..d6020e13cd 100644 --- a/akka-camel/src/main/scala/akka/camel/CamelSupport.scala +++ b/akka-camel/src/main/scala/akka/camel/CamelSupport.scala @@ -4,9 +4,6 @@ package akka.camel import akka.actor.Actor -import com.typesafe.config.Config -import scala.concurrent.duration.Duration -import java.util.concurrent.TimeUnit._ private[camel] trait CamelSupport { this: Actor ⇒ diff --git a/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala b/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala index 72d1b1f17f..ccab13e0a2 100644 --- a/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala +++ b/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala @@ -4,7 +4,6 @@ package akka.camel.internal.component -import language.postfixOps import java.util.{ Map ⇒ JMap } import org.apache.camel._ import org.apache.camel.impl.{ DefaultProducer, DefaultEndpoint, DefaultComponent } @@ -12,9 +11,9 @@ import akka.actor._ import akka.pattern._ import scala.beans.BeanProperty import scala.concurrent.duration._ -import scala.concurrent.{ ExecutionContext, Future } +import scala.concurrent.{ Future } import scala.util.control.NonFatal -import java.util.concurrent.{ TimeUnit, TimeoutException, CountDownLatch } +import java.util.concurrent.{ TimeoutException, CountDownLatch } import akka.util.Timeout import akka.camel.internal.CamelExchangeAdapter import akka.camel.{ ActorNotRegisteredException, Camel, Ack, FailureResult, CamelMessage } @@ -199,7 +198,6 @@ private[camel] object DurationTypeConverter extends TypeConverterSupport { * @param actorPath the String representation of the path to the actor */ private[camel] case class ActorEndpointPath private (actorPath: String) { - import ActorEndpointPath._ require(actorPath != null) require(actorPath.length() > 0) require(actorPath.startsWith("akka://")) diff --git a/akka-camel/src/main/scala/akka/camel/javaapi/UntypedProducerActor.scala b/akka-camel/src/main/scala/akka/camel/javaapi/UntypedProducerActor.scala index dea717333a..4114b760d4 100644 --- a/akka-camel/src/main/scala/akka/camel/javaapi/UntypedProducerActor.scala +++ b/akka-camel/src/main/scala/akka/camel/javaapi/UntypedProducerActor.scala @@ -6,7 +6,7 @@ package akka.camel.javaapi import akka.actor.UntypedActor import akka.camel._ -import org.apache.camel.{ CamelContext, ProducerTemplate } +import org.apache.camel.{ ProducerTemplate } import org.apache.camel.impl.DefaultCamelContext /** diff --git a/akka-camel/src/test/scala/akka/camel/CamelConfigSpec.scala b/akka-camel/src/test/scala/akka/camel/CamelConfigSpec.scala index c14eb49727..184b15e7f6 100644 --- a/akka-camel/src/test/scala/akka/camel/CamelConfigSpec.scala +++ b/akka-camel/src/test/scala/akka/camel/CamelConfigSpec.scala @@ -6,8 +6,6 @@ package akka.camel import org.scalatest.Matchers import org.scalatest.WordSpec import akka.actor.ActorSystem -import scala.concurrent.duration.Duration -import java.util.concurrent.TimeUnit._ import akka.testkit.TestKit import akka.util.Helpers.ConfigOps diff --git a/akka-camel/src/test/scala/akka/camel/ConcurrentActivationTest.scala b/akka-camel/src/test/scala/akka/camel/ConcurrentActivationTest.scala index d4c2b199b2..c48562ba0a 100644 --- a/akka-camel/src/test/scala/akka/camel/ConcurrentActivationTest.scala +++ b/akka-camel/src/test/scala/akka/camel/ConcurrentActivationTest.scala @@ -3,7 +3,6 @@ */ package akka.camel -import language.postfixOps import org.scalatest.WordSpec import org.scalatest.Matchers import scala.concurrent.{ Promise, Await, Future } diff --git a/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala b/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala index 54c9494a45..b673fa9057 100644 --- a/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala +++ b/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala @@ -4,7 +4,6 @@ package akka.camel -import internal.ActorActivationException import language.postfixOps import language.existentials @@ -12,7 +11,7 @@ import akka.actor._ import org.scalatest.Matchers import org.scalatest.WordSpec import akka.camel.TestSupport._ -import org.apache.camel.model.{ ProcessorDefinition, RouteDefinition } +import org.apache.camel.model.{ RouteDefinition } import org.apache.camel.builder.Builder import org.apache.camel.{ FailedToCreateRouteException, CamelExecutionException } import java.util.concurrent.{ ExecutionException, TimeUnit, TimeoutException } diff --git a/akka-camel/src/test/scala/akka/camel/DefaultCamelTest.scala b/akka-camel/src/test/scala/akka/camel/DefaultCamelTest.scala index 338683dba7..154cdfcf04 100644 --- a/akka-camel/src/test/scala/akka/camel/DefaultCamelTest.scala +++ b/akka-camel/src/test/scala/akka/camel/DefaultCamelTest.scala @@ -8,14 +8,13 @@ import akka.camel.TestSupport.SharedCamelSystem import internal.DefaultCamel import org.scalatest.Matchers import org.scalatest.mock.MockitoSugar -import org.apache.camel.{ CamelContext, ProducerTemplate } +import org.apache.camel.{ ProducerTemplate } import org.scalatest.WordSpec import akka.event.LoggingAdapter import akka.actor.ActorSystem.Settings import com.typesafe.config.ConfigFactory import org.apache.camel.impl.DefaultCamelContext -import org.apache.camel.spi.Registry -import akka.actor.{ ExtendedActorSystem, ActorSystem } +import akka.actor.{ ExtendedActorSystem } class DefaultCamelTest extends WordSpec with SharedCamelSystem with Matchers with MockitoSugar { @@ -65,4 +64,4 @@ class DefaultCamelTest extends WordSpec with SharedCamelSystem with Matchers wit verify(camel.context).stop() } -} \ No newline at end of file +} diff --git a/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala b/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala index 001f5d4a96..6106ff7f37 100644 --- a/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala +++ b/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala @@ -10,11 +10,9 @@ import org.apache.camel.{ Exchange, Processor } import org.apache.camel.builder.RouteBuilder import org.apache.camel.component.mock.MockEndpoint import scala.concurrent.Await -import akka.camel.TestSupport.SharedCamelSystem import akka.actor.SupervisorStrategy.Stop import org.scalatest.{ BeforeAndAfterEach, BeforeAndAfterAll, WordSpecLike } import akka.actor._ -import akka.pattern._ import scala.concurrent.duration._ import akka.util.Timeout import org.scalatest.Matchers diff --git a/akka-camel/src/test/scala/akka/camel/UntypedProducerTest.scala b/akka-camel/src/test/scala/akka/camel/UntypedProducerTest.scala index 040a996965..0ce10b714e 100644 --- a/akka-camel/src/test/scala/akka/camel/UntypedProducerTest.scala +++ b/akka-camel/src/test/scala/akka/camel/UntypedProducerTest.scala @@ -17,7 +17,6 @@ import scala.concurrent.Await import scala.concurrent.duration._ import org.scalatest._ import akka.testkit._ -import matchers.MustMatchers class UntypedProducerTest extends WordSpec with Matchers with BeforeAndAfterAll with BeforeAndAfterEach with SharedCamelSystem with GivenWhenThen { import UntypedProducerTest._ diff --git a/akka-camel/src/test/scala/akka/camel/internal/ActivationTrackerTest.scala b/akka-camel/src/test/scala/akka/camel/internal/ActivationTrackerTest.scala index ce8d59135f..7d0b2edc4d 100644 --- a/akka-camel/src/test/scala/akka/camel/internal/ActivationTrackerTest.scala +++ b/akka-camel/src/test/scala/akka/camel/internal/ActivationTrackerTest.scala @@ -1,11 +1,9 @@ package akka.camel.internal -import language.postfixOps import org.scalatest.Matchers import scala.concurrent.duration._ import org.scalatest.{ GivenWhenThen, BeforeAndAfterEach, BeforeAndAfterAll, WordSpecLike } import akka.actor.{ Props, ActorSystem } -import akka.camel._ import akka.testkit.{ TimingTest, TestProbe, TestKit } import akka.camel.internal.ActivationProtocol._ diff --git a/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala b/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala index cba282a81e..86cbb742ad 100644 --- a/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala +++ b/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala @@ -8,7 +8,7 @@ import language.postfixOps import org.scalatest.mock.MockitoSugar import org.mockito.Matchers.any import org.mockito.Mockito._ -import org.apache.camel.{ CamelContext, ProducerTemplate, AsyncCallback } +import org.apache.camel.{ ProducerTemplate, AsyncCallback } import java.util.concurrent.atomic.AtomicBoolean import scala.concurrent.duration._ import java.lang.String @@ -16,16 +16,16 @@ import akka.camel._ import internal.{ DefaultCamel, CamelExchangeAdapter } import org.scalatest.{ Suite, WordSpecLike, BeforeAndAfterAll, BeforeAndAfterEach } import akka.camel.TestSupport._ -import java.util.concurrent.{ TimeoutException, CountDownLatch, TimeUnit } +import java.util.concurrent.{ TimeoutException, CountDownLatch } import org.mockito.{ ArgumentMatcher, Matchers ⇒ MMatchers, Mockito } import org.scalatest.Matchers -import akka.actor.Status.{ Success, Failure } +import akka.actor.Status.{ Failure } import com.typesafe.config.ConfigFactory import akka.actor.ActorSystem.Settings import akka.event.LoggingAdapter import akka.testkit.{ TestLatch, TimingTest, TestKit, TestProbe } import org.apache.camel.impl.DefaultCamelContext -import scala.concurrent.{ Await, Promise, Future } +import scala.concurrent.{ Await, Future } import akka.util.Timeout import akka.actor._ import akka.testkit._ diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsCollector.scala b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsCollector.scala index 6bc55921a4..0b77b79e6d 100644 --- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsCollector.scala +++ b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsCollector.scala @@ -14,7 +14,6 @@ import akka.cluster.Cluster import scala.collection.immutable import akka.cluster.MemberStatus import java.util.concurrent.ThreadLocalRandom -import akka.actor.Terminated import akka.actor.DeadLetterSuppression /** @@ -46,7 +45,6 @@ case object CollectionStopMessage extends CollectionControlMessage { * Actor providing customizable metrics collection supervision. */ private[metrics] class ClusterMetricsSupervisor extends Actor with ActorLogging { - import ClusterMetricsExtension._ val metrics = ClusterMetricsExtension(context.system) import metrics.settings._ import context._ @@ -132,7 +130,7 @@ private[metrics] class ClusterMetricsCollector extends Actor with ActorLogging { import Member.addressOrdering import context.dispatcher val cluster = Cluster(context.system) - import cluster.{ selfAddress, scheduler, settings } + import cluster.{ selfAddress, scheduler } import cluster.InfoLogger._ val metrics = ClusterMetricsExtension(context.system) import metrics.settings._ diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsRouting.scala b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsRouting.scala index 18b92dc618..9e80a1f649 100644 --- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsRouting.scala +++ b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsRouting.scala @@ -17,7 +17,6 @@ import akka.actor.NoSerializationVerificationNeeded import akka.actor.Props import akka.actor.SupervisorStrategy import akka.cluster.Cluster -import akka.cluster.ClusterEvent.CurrentClusterState import akka.dispatch.Dispatchers import akka.japi.Util.immutableSeq import akka.routing._ diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/MetricsCollector.scala b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/MetricsCollector.scala index 63b4157b3d..f33f54d89f 100644 --- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/MetricsCollector.scala +++ b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/MetricsCollector.scala @@ -7,7 +7,6 @@ package akka.cluster.metrics import akka.actor.ActorSystem import akka.actor.ExtendedActorSystem import akka.event.Logging -import akka.event.LoggingAdapter import akka.ConfigurationException import akka.actor.Address import java.lang.management.MemoryMXBean diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Provision.scala b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Provision.scala index 4e6cb64b1f..6bf54fe347 100644 --- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Provision.scala +++ b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Provision.scala @@ -8,7 +8,6 @@ import java.io.File import kamon.sigar.SigarProvisioner import org.hyperic.sigar.Sigar import org.hyperic.sigar.SigarProxy -import org.hyperic.sigar.SigarException import scala.language.postfixOps import scala.util.Success import scala.util.Failure diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/protobuf/MessageSerializer.scala b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/protobuf/MessageSerializer.scala index 773aaa0b74..208493c886 100644 --- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/protobuf/MessageSerializer.scala +++ b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/protobuf/MessageSerializer.scala @@ -9,7 +9,7 @@ import java.util.zip.{ GZIPInputStream, GZIPOutputStream } import java.{ lang ⇒ jl } import akka.actor.{ Address, ExtendedActorSystem } import akka.cluster.metrics.protobuf.msg.{ ClusterMetricsMessages ⇒ cm } -import akka.cluster.metrics.{ ClusterMetricsMessage, ClusterMetricsSettings, EWMA, Metric, MetricsGossip, MetricsGossipEnvelope, NodeMetrics } +import akka.cluster.metrics.{ EWMA, Metric, MetricsGossip, MetricsGossipEnvelope, NodeMetrics } import akka.serialization.BaseSerializer import akka.util.ClassLoaderObjectInputStream import akka.protobuf.{ ByteString, MessageLite } diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala index 8cbb0f4119..e5c0990d6f 100644 --- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala +++ b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala @@ -5,21 +5,15 @@ package akka.cluster.metrics import scala.language.postfixOps -import scala.collection.immutable import scala.concurrent.duration._ -import scala.concurrent.Await -import scala.util.{ Success, Try, Failure } import akka.actor._ import akka.testkit._ import akka.cluster.metrics.StandardMetrics._ -import org.scalatest.WordSpec -import org.scalatest.Matchers import akka.cluster.Cluster @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class MetricsExtensionSpec extends AkkaSpec(MetricsConfig.clusterSigarMock) with ImplicitSender with RedirectLogging { - import system.dispatcher val cluster = Cluster(system) diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsSettingsSpec.scala b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsSettingsSpec.scala index 3e064a95bd..3adb19d85d 100644 --- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsSettingsSpec.scala +++ b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsSettingsSpec.scala @@ -8,8 +8,6 @@ import language.postfixOps import akka.testkit.AkkaSpec import akka.dispatch.Dispatchers import scala.concurrent.duration._ -import akka.remote.PhiAccrualFailureDetector -import akka.util.Helpers.ConfigOps import com.typesafe.config.ConfigFactory @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/EWMASpec.scala b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/EWMASpec.scala index 1de871adc6..6534b75a13 100644 --- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/EWMASpec.scala +++ b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/EWMASpec.scala @@ -4,14 +4,12 @@ package akka.cluster.metrics -import language.postfixOps import scala.concurrent.duration._ import akka.testkit.{ LongRunningTest, AkkaSpec } import java.util.concurrent.ThreadLocalRandom @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class EWMASpec extends AkkaSpec(MetricsConfig.defaultEnabled) with MetricsCollectorFactory { - import system.dispatcher val collector = createMetricsCollector diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/MetricsCollectorSpec.scala b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/MetricsCollectorSpec.scala index 515c726394..0b4041983b 100644 --- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/MetricsCollectorSpec.scala +++ b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/MetricsCollectorSpec.scala @@ -6,20 +6,14 @@ package akka.cluster.metrics import scala.language.postfixOps -import scala.collection.immutable import scala.concurrent.duration._ -import scala.concurrent.Await -import scala.util.{ Success, Try, Failure } +import scala.util.{ Try } -import akka.actor._ import akka.testkit._ import akka.cluster.metrics.StandardMetrics._ -import org.scalatest.WordSpec -import org.scalatest.Matchers @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class MetricsCollectorSpec extends AkkaSpec(MetricsConfig.defaultEnabled) with ImplicitSender with MetricsCollectorFactory { - import system.dispatcher val collector = createMetricsCollector diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/TestUtil.scala b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/TestUtil.scala index 6156ca9add..425b484866 100644 --- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/TestUtil.scala +++ b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/TestUtil.scala @@ -10,10 +10,6 @@ import org.slf4j.bridge.SLF4JBridgeHandler import akka.testkit.AkkaSpec import akka.actor.ExtendedActorSystem import akka.actor.Address -import akka.cluster.MemberStatus -import akka.cluster.Member -import akka.cluster.UniqueAddress -import akka.cluster.Cluster import java.io.Closeable import akka.actor.ActorRef import akka.actor.Props diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/protobuf/MessageSerializerSpec.scala b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/protobuf/MessageSerializerSpec.scala index b0f7933ad5..68d6d45bce 100644 --- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/protobuf/MessageSerializerSpec.scala +++ b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/protobuf/MessageSerializerSpec.scala @@ -5,9 +5,7 @@ package akka.cluster.metrics.protobuf import akka.actor.{ ExtendedActorSystem, Address } -import collection.immutable.SortedSet import akka.testkit.AkkaSpec -import java.math.BigInteger import akka.cluster.MemberStatus import akka.cluster.metrics.MetricsGossip import akka.cluster.metrics.NodeMetrics diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala index 6dc63702c3..50ca0af1ee 100644 --- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala +++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala @@ -9,7 +9,7 @@ import akka.actor.ActorRef import akka.actor.Deploy import akka.actor.Props import akka.actor.Terminated -import akka.cluster.sharding.Shard.{ GetCurrentShardState, ShardCommand } +import akka.cluster.sharding.Shard.{ ShardCommand } import akka.persistence.PersistentActor import akka.persistence.SnapshotOffer import akka.actor.Actor diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/protobuf/ClusterShardingMessageSerializerSpec.scala b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/protobuf/ClusterShardingMessageSerializerSpec.scala index 3de715d2ac..45ef2b31d1 100644 --- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/protobuf/ClusterShardingMessageSerializerSpec.scala +++ b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/protobuf/ClusterShardingMessageSerializerSpec.scala @@ -3,7 +3,7 @@ */ package akka.cluster.sharding.protobuf -import akka.actor.{ ExtendedActorSystem, Address } +import akka.actor.{ ExtendedActorSystem } import akka.testkit.AkkaSpec import akka.actor.Props import akka.cluster.sharding.ShardCoordinator diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/client/ClusterClient.scala b/akka-cluster-tools/src/main/scala/akka/cluster/client/ClusterClient.scala index f6f93f0865..380c68a102 100644 --- a/akka-cluster-tools/src/main/scala/akka/cluster/client/ClusterClient.scala +++ b/akka-cluster-tools/src/main/scala/akka/cluster/client/ClusterClient.scala @@ -24,7 +24,6 @@ import akka.actor.Identify import akka.actor.NoSerializationVerificationNeeded import akka.actor.Props import akka.actor.ReceiveTimeout -import akka.actor.Terminated import akka.cluster.Cluster import akka.cluster.ClusterEvent._ import akka.cluster.Member diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala b/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala index 2152f77231..9bfd99a166 100644 --- a/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala +++ b/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala @@ -4,22 +4,16 @@ package akka.cluster.pubsub.protobuf import akka.serialization.BaseSerializer -import akka.cluster._ import scala.collection.breakOut import akka.actor.{ ExtendedActorSystem, Address } import scala.Some -import scala.collection.immutable -import java.io.{ ByteArrayInputStream, ObjectOutputStream, ByteArrayOutputStream } +import java.io.{ ByteArrayInputStream, ByteArrayOutputStream } import akka.protobuf.{ ByteString, MessageLite } -import akka.util.ClassLoaderObjectInputStream -import java.{ lang ⇒ jl } import java.util.zip.GZIPOutputStream import java.util.zip.GZIPInputStream import scala.annotation.tailrec import akka.cluster.pubsub.protobuf.msg.{ DistributedPubSubMessages ⇒ dm } import scala.collection.JavaConverters._ -import scala.concurrent.duration.Deadline -import akka.cluster.pubsub.DistributedPubSubMessage import akka.cluster.pubsub.DistributedPubSubMediator._ import akka.cluster.pubsub.DistributedPubSubMediator.Internal._ import akka.serialization.Serialization diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala b/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala index 9be1e7b0ac..1371f88b13 100644 --- a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala +++ b/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala @@ -8,9 +8,7 @@ import com.typesafe.config.Config import scala.concurrent.duration._ import scala.collection.immutable import akka.actor.Actor -import akka.actor.Actor.Receive import akka.actor.Deploy -import akka.actor.ActorLogging import akka.actor.ActorSystem import akka.actor.ActorRef import akka.actor.ActorSelection @@ -222,7 +220,6 @@ object ClusterSingletonManager { */ class OldestChangedBuffer(role: Option[String]) extends Actor { import OldestChangedBuffer._ - import context.dispatcher val cluster = Cluster(context.system) // sort by age, oldest first @@ -372,7 +369,6 @@ class ClusterSingletonManager( settings: ClusterSingletonManagerSettings) extends Actor with FSM[ClusterSingletonManager.State, ClusterSingletonManager.Data] { - import ClusterSingletonManager._ import ClusterSingletonManager.Internal._ import ClusterSingletonManager.Internal.OldestChangedBuffer._ import settings._ diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala index fd59a65cb6..8cd138789e 100644 --- a/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala +++ b/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala @@ -3,7 +3,7 @@ package akka.cluster.pubsub import akka.testkit._ import akka.routing.{ ConsistentHashingRoutingLogic, RouterEnvelope } import org.scalatest.WordSpecLike -import akka.actor.{ ActorInitializationException, ActorRef } +import akka.actor.{ ActorRef } import com.typesafe.config.ConfigFactory case class WrappedMessage(msg: String) extends RouterEnvelope { diff --git a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala index af306d30f0..8e3493386b 100644 --- a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala +++ b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala @@ -21,7 +21,6 @@ import scala.annotation.varargs import scala.collection.immutable import scala.concurrent.duration._ import scala.concurrent.{ Await, ExecutionContext } -import scala.language.implicitConversions import scala.util.control.NonFatal /** diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala index c44aa24324..52327b2ed2 100644 --- a/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala +++ b/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala @@ -4,7 +4,6 @@ package akka.cluster import language.existentials -import language.postfixOps import scala.collection.immutable import scala.concurrent.duration._ import java.util.concurrent.ThreadLocalRandom diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala index 7239c8cfbd..f192c9314b 100644 --- a/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala +++ b/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala @@ -3,13 +3,10 @@ */ package akka.cluster -import language.postfixOps import scala.annotation.tailrec import scala.collection.immutable -import scala.concurrent.duration._ -import akka.actor.{ ActorLogging, ActorRef, ActorSelection, Address, Actor, RootActorPath, Props } +import akka.actor.{ ActorLogging, ActorSelection, Address, Actor, RootActorPath } import akka.cluster.ClusterEvent._ -import akka.routing.MurmurHash import akka.remote.FailureDetectorRegistry import akka.remote.PriorityMessage import akka.actor.DeadLetterSuppression @@ -66,7 +63,6 @@ private[cluster] final class ClusterHeartbeatSender extends Actor with ActorLogg val verboseHeartbeat = cluster.settings.Debug.VerboseHeartbeatLogging import cluster.{ selfAddress, selfUniqueAddress, scheduler } import cluster.settings._ - import cluster.InfoLogger._ import context.dispatcher // the failureDetector is only updated by this actor, but read from other places diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterMetricsCollector.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterMetricsCollector.scala index c64090580a..941fdb8ba8 100644 --- a/akka-cluster/src/main/scala/akka/cluster/ClusterMetricsCollector.scala +++ b/akka-cluster/src/main/scala/akka/cluster/ClusterMetricsCollector.scala @@ -21,7 +21,6 @@ import akka.actor.ActorLogging import akka.actor.ActorRef import akka.actor.ActorSystem import akka.actor.Address -import akka.actor.DynamicAccess import akka.actor.ExtendedActorSystem import akka.cluster.MemberStatus.Up import akka.cluster.MemberStatus.WeaklyUp diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterReadView.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterReadView.scala index 7a8d995e55..0dc643a4d9 100644 --- a/akka-cluster/src/main/scala/akka/cluster/ClusterReadView.scala +++ b/akka-cluster/src/main/scala/akka/cluster/ClusterReadView.scala @@ -8,7 +8,7 @@ package akka.cluster import java.io.Closeable import scala.collection.immutable -import akka.actor.{ Actor, ActorRef, ActorSystemImpl, Address, Props } +import akka.actor.{ Actor, ActorRef, Address, Props } import akka.cluster.ClusterEvent._ import akka.actor.PoisonPill import akka.dispatch.{ UnboundedMessageQueueSemantics, RequiresMessageQueue } diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala index 082d93e827..f55d02ae94 100644 --- a/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala +++ b/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala @@ -7,7 +7,6 @@ import scala.collection.immutable import com.typesafe.config.Config import com.typesafe.config.ConfigObject import scala.concurrent.duration.Duration -import java.util.concurrent.TimeUnit.MILLISECONDS import akka.actor.Address import akka.actor.AddressFromURIString import akka.dispatch.Dispatchers diff --git a/akka-cluster/src/main/scala/akka/cluster/Gossip.scala b/akka-cluster/src/main/scala/akka/cluster/Gossip.scala index 853eed6b58..30df8e6e2d 100644 --- a/akka-cluster/src/main/scala/akka/cluster/Gossip.scala +++ b/akka-cluster/src/main/scala/akka/cluster/Gossip.scala @@ -6,7 +6,6 @@ package akka.cluster import scala.collection.immutable import MemberStatus._ -import akka.cluster.protobuf.ClusterMessageSerializer import scala.concurrent.duration.Deadline /** @@ -135,7 +134,6 @@ private[cluster] final case class Gossip( * Merges two Gossip instances including membership tables, and the VectorClock histories. */ def merge(that: Gossip): Gossip = { - import Member.ordering // 1. merge vector clocks val mergedVClock = this.version merge that.version diff --git a/akka-cluster/src/main/scala/akka/cluster/Member.scala b/akka-cluster/src/main/scala/akka/cluster/Member.scala index e9801ea71a..3f55ef5317 100644 --- a/akka-cluster/src/main/scala/akka/cluster/Member.scala +++ b/akka-cluster/src/main/scala/akka/cluster/Member.scala @@ -4,10 +4,6 @@ package akka.cluster -import language.implicitConversions - -import scala.collection.immutable -import scala.collection.GenTraversableOnce import akka.actor.Address import MemberStatus._ diff --git a/akka-cluster/src/main/scala/akka/cluster/Reachability.scala b/akka-cluster/src/main/scala/akka/cluster/Reachability.scala index 904497d803..57ced59f72 100644 --- a/akka-cluster/src/main/scala/akka/cluster/Reachability.scala +++ b/akka-cluster/src/main/scala/akka/cluster/Reachability.scala @@ -3,10 +3,8 @@ */ package akka.cluster -import scala.annotation.tailrec import scala.collection.immutable import scala.collection.breakOut -import akka.actor.Address /** * INTERNAL API diff --git a/akka-cluster/src/main/scala/akka/cluster/VectorClock.scala b/akka-cluster/src/main/scala/akka/cluster/VectorClock.scala index d80fc37d3a..c540cff3ee 100644 --- a/akka-cluster/src/main/scala/akka/cluster/VectorClock.scala +++ b/akka-cluster/src/main/scala/akka/cluster/VectorClock.scala @@ -4,11 +4,7 @@ package akka.cluster -import akka.AkkaException - -import System.{ currentTimeMillis ⇒ newTimestamp } import java.security.MessageDigest -import java.util.concurrent.atomic.AtomicLong import scala.collection.immutable.TreeMap import scala.annotation.tailrec diff --git a/akka-cluster/src/test/scala/akka/cluster/AutoDownSpec.scala b/akka-cluster/src/test/scala/akka/cluster/AutoDownSpec.scala index 64a4d6086a..7e39a183d9 100644 --- a/akka-cluster/src/test/scala/akka/cluster/AutoDownSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/AutoDownSpec.scala @@ -4,8 +4,6 @@ package akka.cluster -import language.postfixOps -import language.reflectiveCalls import scala.concurrent.duration._ import akka.actor.Address import akka.actor.Scheduler diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala index 3ec3f50d9b..63d3b06ce3 100644 --- a/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala @@ -7,8 +7,6 @@ package akka.cluster import org.scalatest.WordSpec import org.scalatest.Matchers import akka.actor.Address -import scala.concurrent.duration._ -import scala.collection.immutable import akka.remote.FailureDetector import akka.remote.DefaultFailureDetectorRegistry import java.util.concurrent.ThreadLocalRandom diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala index 15fa51c061..e8ca1b3955 100644 --- a/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala @@ -4,8 +4,6 @@ package akka.cluster -import language.postfixOps -import language.reflectiveCalls import scala.concurrent.duration._ import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender @@ -14,7 +12,6 @@ import akka.actor.Address import akka.cluster.InternalClusterAction._ import java.lang.management.ManagementFactory import javax.management.ObjectName -import akka.actor.ActorRef import akka.testkit.TestProbe import akka.actor.ActorSystem import akka.actor.Props @@ -39,7 +36,6 @@ object ClusterSpec { @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class ClusterSpec extends AkkaSpec(ClusterSpec.config) with ImplicitSender { - import ClusterSpec._ val selfAddress = system.asInstanceOf[ExtendedActorSystem].provider.getDefaultAddress diff --git a/akka-cluster/src/test/scala/akka/cluster/EWMASpec.scala b/akka-cluster/src/test/scala/akka/cluster/EWMASpec.scala index 169b3f83d4..1f0de2f553 100644 --- a/akka-cluster/src/test/scala/akka/cluster/EWMASpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/EWMASpec.scala @@ -6,14 +6,12 @@ package akka.cluster // TODO remove metrics -import language.postfixOps import scala.concurrent.duration._ import akka.testkit.{ LongRunningTest, AkkaSpec } import java.util.concurrent.ThreadLocalRandom @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class EWMASpec extends AkkaSpec(MetricsEnabledSpec.config) with MetricsCollectorFactory { - import system.dispatcher val collector = createMetricsCollector diff --git a/akka-cluster/src/test/scala/akka/cluster/FailureDetectorPuppet.scala b/akka-cluster/src/test/scala/akka/cluster/FailureDetectorPuppet.scala index 25abe6e98a..3802e5c06c 100644 --- a/akka-cluster/src/test/scala/akka/cluster/FailureDetectorPuppet.scala +++ b/akka-cluster/src/test/scala/akka/cluster/FailureDetectorPuppet.scala @@ -5,7 +5,6 @@ package akka.cluster import java.util.concurrent.atomic.AtomicReference -import akka.remote.testkit.MultiNodeConfig import akka.remote.FailureDetector import com.typesafe.config.Config import akka.event.EventStream diff --git a/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingPerfSpec.scala b/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingPerfSpec.scala index b5d6b338f1..c955d4deea 100644 --- a/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingPerfSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingPerfSpec.scala @@ -3,8 +3,6 @@ */ package akka.cluster -import scala.collection.immutable.HashSet -import scala.concurrent.duration.Deadline import org.scalatest.WordSpec import org.scalatest.Matchers import akka.actor.Address diff --git a/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingSpec.scala b/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingSpec.scala index e6a27c6598..bc3a87dad5 100644 --- a/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingSpec.scala @@ -7,9 +7,6 @@ package akka.cluster import org.scalatest.WordSpec import org.scalatest.Matchers import akka.actor.Address -import akka.routing.ConsistentHash -import scala.concurrent.duration._ -import scala.collection.immutable @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class HeartbeatNodeRingSpec extends WordSpec with Matchers { diff --git a/akka-cluster/src/test/scala/akka/cluster/MemberOrderingSpec.scala b/akka-cluster/src/test/scala/akka/cluster/MemberOrderingSpec.scala index 1596e2c7a7..58e7e259e6 100644 --- a/akka-cluster/src/test/scala/akka/cluster/MemberOrderingSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/MemberOrderingSpec.scala @@ -5,7 +5,6 @@ package akka.cluster import akka.actor.{ Address, AddressFromURIString } -import java.net.InetSocketAddress import org.scalatest.Matchers import org.scalatest.WordSpec import scala.collection.immutable.SortedSet diff --git a/akka-cluster/src/test/scala/akka/cluster/MetricValuesSpec.scala b/akka-cluster/src/test/scala/akka/cluster/MetricValuesSpec.scala index 9c58cc6ef7..501dca3ea9 100644 --- a/akka-cluster/src/test/scala/akka/cluster/MetricValuesSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/MetricValuesSpec.scala @@ -6,7 +6,6 @@ package akka.cluster // TODO remove metrics -import scala.util.Try import akka.actor.Address import akka.testkit.AkkaSpec import akka.cluster.StandardMetrics._ diff --git a/akka-cluster/src/test/scala/akka/cluster/MetricsCollectorSpec.scala b/akka-cluster/src/test/scala/akka/cluster/MetricsCollectorSpec.scala index fe581933ed..c9c0b92266 100644 --- a/akka-cluster/src/test/scala/akka/cluster/MetricsCollectorSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/MetricsCollectorSpec.scala @@ -9,16 +9,12 @@ package akka.cluster import scala.language.postfixOps -import scala.collection.immutable import scala.concurrent.duration._ -import scala.concurrent.Await -import scala.util.{ Success, Try, Failure } +import scala.util.{ Try } import akka.actor._ import akka.testkit._ import akka.cluster.StandardMetrics._ -import org.scalatest.WordSpec -import org.scalatest.Matchers object MetricsEnabledSpec { val config = """ @@ -31,7 +27,6 @@ object MetricsEnabledSpec { @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class MetricsCollectorSpec extends AkkaSpec(MetricsEnabledSpec.config) with ImplicitSender with MetricsCollectorFactory { - import system.dispatcher val collector = createMetricsCollector diff --git a/akka-cluster/src/test/scala/akka/cluster/MetricsGossipSpec.scala b/akka-cluster/src/test/scala/akka/cluster/MetricsGossipSpec.scala index 4896bacd77..074f9523e2 100644 --- a/akka-cluster/src/test/scala/akka/cluster/MetricsGossipSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/MetricsGossipSpec.scala @@ -6,8 +6,6 @@ package akka.cluster // TODO remove metrics -import scala.concurrent.duration._ - import akka.testkit.{ ImplicitSender, AkkaSpec } import akka.actor.Address diff --git a/akka-cluster/src/test/scala/akka/cluster/StartupWithOneThreadSpec.scala b/akka-cluster/src/test/scala/akka/cluster/StartupWithOneThreadSpec.scala index 7213c9930b..028a881e32 100644 --- a/akka-cluster/src/test/scala/akka/cluster/StartupWithOneThreadSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/StartupWithOneThreadSpec.scala @@ -4,18 +4,10 @@ package akka.cluster -import language.postfixOps -import language.reflectiveCalls import scala.concurrent.duration._ import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender -import akka.actor.ExtendedActorSystem import akka.actor.Address -import akka.cluster.InternalClusterAction._ -import java.lang.management.ManagementFactory -import javax.management.ObjectName -import akka.actor.ActorRef -import akka.testkit.TestProbe import akka.actor.Props import akka.actor.Actor import akka.actor.ActorLogging diff --git a/akka-cluster/src/test/scala/akka/cluster/VectorClockPerfSpec.scala b/akka-cluster/src/test/scala/akka/cluster/VectorClockPerfSpec.scala index 21a79aabca..c68bf36882 100644 --- a/akka-cluster/src/test/scala/akka/cluster/VectorClockPerfSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/VectorClockPerfSpec.scala @@ -4,7 +4,6 @@ package akka.cluster -import akka.testkit.AkkaSpec import scala.collection.immutable.{ TreeMap, SortedSet } import org.scalatest.WordSpec import org.scalatest.Matchers diff --git a/akka-cluster/src/test/scala/akka/cluster/protobuf/ClusterMessageSerializerSpec.scala b/akka-cluster/src/test/scala/akka/cluster/protobuf/ClusterMessageSerializerSpec.scala index 582827224b..f74e5e56d6 100644 --- a/akka-cluster/src/test/scala/akka/cluster/protobuf/ClusterMessageSerializerSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/protobuf/ClusterMessageSerializerSpec.scala @@ -9,7 +9,6 @@ import akka.cluster._ import akka.actor.{ ExtendedActorSystem, Address } import collection.immutable.SortedSet import akka.testkit.AkkaSpec -import java.math.BigInteger @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class ClusterMessageSerializerSpec extends AkkaSpec( diff --git a/akka-contrib/src/main/scala/akka/contrib/throttle/TimerBasedThrottler.scala b/akka-contrib/src/main/scala/akka/contrib/throttle/TimerBasedThrottler.scala index edc5b7bba1..51b204b765 100644 --- a/akka-contrib/src/main/scala/akka/contrib/throttle/TimerBasedThrottler.scala +++ b/akka-contrib/src/main/scala/akka/contrib/throttle/TimerBasedThrottler.scala @@ -1,305 +1,301 @@ -/** - * Copyright (C) 2009-2016 Lightbend Inc. - */ - -package akka.contrib.throttle - -import scala.concurrent.duration.{ Duration, FiniteDuration } -import scala.util.control.NonFatal -import scala.collection.immutable.{ Queue ⇒ Q } -import akka.actor.{ ActorRef, Actor, FSM } -import Throttler._ -import TimerBasedThrottler._ -import java.util.concurrent.TimeUnit -import akka.AkkaException - -/** - * @see [[akka.contrib.throttle.TimerBasedThrottler]] - * @see [[akka.contrib.throttle.Throttler.Rate]] - * @see [[akka.contrib.throttle.Throttler.SetRate]] - * @see [[akka.contrib.throttle.Throttler.SetTarget]] - */ -object Throttler { - /** - * A rate used for throttling. - * - * Scala API: There are some shorthands available to construct rates: - * {{{ - * import java.util.concurrent.TimeUnit._ - * import scala.concurrent.duration.{ Duration, FiniteDuration } - * - * val rate1 = 1 msgsPer (1, SECONDS) - * val rate2 = 1 msgsPer Duration(1, SECONDS) - * val rate3 = 1 msgsPer (1 seconds) - * val rate4 = 1 msgsPerSecond - * val rate5 = 1 msgsPerMinute - * val rate6 = 1 msgsPerHour - * }}} - * - * @param numberOfCalls the number of calls that may take place in a period - * @param duration the length of the period - * @see [[akka.contrib.throttle.Throttler]] - */ - final case class Rate(val numberOfCalls: Int, val duration: FiniteDuration) { - /** - * The duration in milliseconds. - */ - def durationInMillis(): Long = duration.toMillis - } - - /** - * Set the target of a throttler. - * - * You may change a throttler's target at any time. - * - * Notice that the messages sent by the throttler to the target will have the original sender (and - * not the throttler) as the sender. (In Akka terms, the throttler `forward`s the message.) - * - * @param target if `target` is `None`, the throttler will stop delivering messages and the messages already received - * but not yet delivered, as well as any messages received in the future will be queued - * and eventually be delivered when a new target is set. If `target` is not `None`, the currently queued messages - * as well as any messages received in the future will be delivered to the new target at a rate not exceeding the current throttler's rate. - */ - final case class SetTarget(target: Option[ActorRef]) { - /** - * Java API: - * @param target if `target` is `null`, the throttler will stop delivering messages and the messages already received - * but not yet delivered, as well as any messages received in the future will be queued - * and eventually be delivered when a new target is set. If `target` is not `null`, the currently queued messages - * as well as any messages received in the future will be delivered to the new target at a rate not exceeding - * the current throttler's rate. - */ - def this(target: ActorRef) = this(Option(target)) - } - - /** - * Set the rate of a throttler. - * - * You may change a throttler's rate at any time. - * - * @param rate the rate at which messages will be delivered to the target of the throttler - */ - final case class SetRate(rate: Rate) - - import language.implicitConversions - - /** - * Helper for some syntactic sugar. - * - * @see [[akka.contrib.throttle.Throttler.Rate]] - */ - implicit class RateInt(val numberOfCalls: Int) extends AnyVal { - def msgsPer(duration: Int, timeUnit: TimeUnit) = Rate(numberOfCalls, Duration(duration, timeUnit)) - def msgsPer(duration: FiniteDuration) = Rate(numberOfCalls, duration) - def msgsPerSecond = Rate(numberOfCalls, Duration(1, TimeUnit.SECONDS)) - def msgsPerMinute = Rate(numberOfCalls, Duration(1, TimeUnit.MINUTES)) - def msgsPerHour = Rate(numberOfCalls, Duration(1, TimeUnit.HOURS)) - } - -} - -/** - * INTERNAL API - */ -private[throttle] object TimerBasedThrottler { - case object Tick - - // States of the FSM: A `TimerBasedThrottler` is in state `Active` iff the timer is running. - sealed trait State - case object Idle extends State - case object Active extends State - - // Messages, as we queue them to be sent later - final case class Message(message: Any, sender: ActorRef) - - // The data of the FSM - final case class Data(target: Option[ActorRef], - callsLeftInThisPeriod: Int, - queue: Q[Message]) -} - -/** - * A throttler that uses a timer to control the message delivery rate. - * - * == Throttling == - * A throttler is an actor that is defined through a target actor and a rate - * (of type [[akka.contrib.throttle.Throttler.Rate]]). You set or change the target and rate at any time through the - * [[akka.contrib.throttle.Throttler.SetTarget]] and [[akka.contrib.throttle.Throttler.SetRate]] - * messages, respectively. When you send the throttler any other message `msg`, it will - * put the message `msg` into an internal queue and eventually send all queued messages to the target, at - * a speed that respects the given rate. If no target is currently defined then the messages will be queued - * and will be delivered as soon as a target gets set. - * - * A throttler understands actor messages of type - * [[akka.contrib.throttle.Throttler.SetTarget]], [[akka.contrib.throttle.Throttler.SetRate]], in - * addition to any other messages, which the throttler will consider as messages to be sent to - * the target. - * - * == Transparency == - * Notice that the throttler `forward`s messages, i.e., the target will see the original message sender - * (and not the throttler) as the sender of the message. - * - * == Persistence == - * Throttlers usually use an internal queue to keep the messages that need to be sent to the target. - * You therefore cannot rely on the throttler's inbox size in order to learn how much messages are - * outstanding. - * - * It is left to the implementation whether the internal queue is persisted over application restarts or - * actor failure. - * - * == Processing messages == - * The target should process messages as fast as possible. If the target requires substantial time to - * process messages, it should distribute its work to other actors (using for example something like - * a `BalancingDispatcher`), otherwise the resulting system will always work below - * the threshold rate. - * - * Example: Suppose the throttler has a rate of 3msg/s and the target requires 1s to process a message. - * This system will only process messages at a rate of 1msg/s: the target will receive messages at at most 3msg/s - * but as it handles them synchronously and each of them takes 1s, its inbox will grow and grow. In such - * a situation, the target should distribute its messages to a set of worker actors so that individual messages - * can be handled in parallel. - * - * ==Example== - * For example, if you set a rate like "3 messages in 1 second", the throttler - * will send the first three messages immediately to the target actor but will need to impose a delay before - * sending out further messages: - * {{{ - * // A simple actor that prints whatever it receives - * class Printer extends Actor { - * def receive = { - * case x => println(x) - * } - * } - * - * val printer = system.actorOf(Props[Printer], "printer") - * - * // The throttler for this example, setting the rate - * val throttler = system.actorOf(Props(classOf[TimerBasedThrottler], 3 msgsPer 1.second)) - * - * // Set the target - * throttler ! SetTarget(Some(printer)) - * // These three messages will be sent to the printer immediately - * throttler ! "1" - * throttler ! "2" - * throttler ! "3" - * // These two will wait at least until 1 second has passed - * throttler ! "4" - * throttler ! "5" - * }}} - * - * ==Implementation notes== - * This throttler implementation internally installs a timer that repeats every `rate.durationInMillis` and enables `rate.numberOfCalls` - * additional calls to take place. A `TimerBasedThrottler` uses very few system resources, provided the rate's duration is not too - * fine-grained (which would cause a lot of timer invocations); for example, it does not store the calling history - * as other throttlers may need to do. - * - * However, a `TimerBasedThrottler` only provides ''weak guarantees'' on the rate (see also - * this blog post): - * - * - Only ''delivery'' times are taken into account: if, for example, the throttler is used to throttle - * requests to an external web service then only the start times of the web requests are considered. - * If a web request takes very long on the server then more than `rate.numberOfCalls`-many requests - * may be observed on the server in an interval of duration `rate.durationInMillis()`. - * - There may be intervals of duration `rate.durationInMillis()` that contain more than `rate.numberOfCalls` - * message deliveries: a `TimerBasedThrottler` only makes guarantees for the intervals - * of its ''own'' timer, namely that no more than `rate.numberOfCalls`-many messages are delivered within such intervals. Other intervals on the - * timeline may contain more calls. - * - * For some applications, these guarantees may not be sufficient. - * - * ==Known issues== - * - * - If you change the rate using `SetRate(rate)`, the actual rate may in fact be higher for the - * overlapping period (i.e., `durationInMillis()`) of the new and old rate. Therefore, - * changing the rate frequently is not recommended with the current implementation. - * - The queue of messages to be delivered is not persisted in any way; actor or system failure will - * cause the queued messages to be lost. - * - * @see [[akka.contrib.throttle.Throttler]] - */ -class TimerBasedThrottler(var rate: Rate) extends Actor with FSM[State, Data] { - startWith(Idle, Data(None, rate.numberOfCalls, Q())) - - // Idle: no messages, or target not set - when(Idle) { - // Set the rate - case Event(SetRate(rate), d) ⇒ - this.rate = rate - stay using d.copy(callsLeftInThisPeriod = rate.numberOfCalls) - - // Set the target - case Event(SetTarget(t @ Some(_)), d) if !d.queue.isEmpty ⇒ - goto(Active) using deliverMessages(d.copy(target = t)) - case Event(SetTarget(t), d) ⇒ - stay using d.copy(target = t) - - // Queuing - case Event(msg, d @ Data(None, _, queue)) ⇒ - stay using d.copy(queue = queue.enqueue(Message(msg, context.sender()))) - case Event(msg, d @ Data(Some(_), _, Seq())) ⇒ - goto(Active) using deliverMessages(d.copy(queue = Q(Message(msg, context.sender())))) - // Note: The case Event(msg, t @ Data(Some(_), _, _, Seq(_*))) should never happen here. - } - - when(Active) { - // Set the rate - case Event(SetRate(rate), d) ⇒ - this.rate = rate - // Note: this should be improved (see "Known issues" in class comments) - stopTimer() - startTimer(rate) - stay using d.copy(callsLeftInThisPeriod = rate.numberOfCalls) - - // Set the target (when the new target is None) - case Event(SetTarget(None), d) ⇒ - // Note: We do not yet switch to state `Inactive` because we need the timer to tick once more before - stay using d.copy(target = None) - - // Set the target (when the new target is not None) - case Event(SetTarget(t @ Some(_)), d) ⇒ - stay using d.copy(target = t) - - // Tick after a `SetTarget(None)`: take the additional permits and go to `Idle` - case Event(Tick, d @ Data(None, _, _)) ⇒ - goto(Idle) using d.copy(callsLeftInThisPeriod = rate.numberOfCalls) - - // Period ends and we have no more messages: take the additional permits and go to `Idle` - case Event(Tick, d @ Data(_, _, Seq())) ⇒ - goto(Idle) using d.copy(callsLeftInThisPeriod = rate.numberOfCalls) - - // Period ends and we get more occasions to send messages - case Event(Tick, d @ Data(_, _, _)) ⇒ - stay using deliverMessages(d.copy(callsLeftInThisPeriod = rate.numberOfCalls)) - - // Queue a message (when we cannot send messages in the current period anymore) - case Event(msg, d @ Data(_, 0, queue)) ⇒ - stay using d.copy(queue = queue.enqueue(Message(msg, context.sender()))) - - // Queue a message (when we can send some more messages in the current period) - case Event(msg, d @ Data(_, _, queue)) ⇒ - stay using deliverMessages(d.copy(queue = queue.enqueue(Message(msg, context.sender())))) - } - - onTransition { - case Idle -> Active ⇒ startTimer(rate) - case Active -> Idle ⇒ stopTimer() - } - - initialize() - - private def startTimer(rate: Rate) = setTimer("morePermits", Tick, rate.duration, true) - private def stopTimer() = cancelTimer("morePermits") - - /** - * Send as many messages as we can (while respecting the rate) to the target and - * return the state data (with the queue containing the remaining ones). - */ - private def deliverMessages(data: Data): Data = { - val queue = data.queue - val nrOfMsgToSend = scala.math.min(queue.length, data.callsLeftInThisPeriod) - - queue.take(nrOfMsgToSend).foreach(x ⇒ data.target.get.tell(x.message, x.sender)) - - data.copy(queue = queue.drop(nrOfMsgToSend), callsLeftInThisPeriod = data.callsLeftInThisPeriod - nrOfMsgToSend) - } -} +/** + * Copyright (C) 2009-2016 Lightbend Inc. + */ + +package akka.contrib.throttle + +import scala.concurrent.duration.{ Duration, FiniteDuration } +import scala.collection.immutable.{ Queue ⇒ Q } +import akka.actor.{ ActorRef, Actor, FSM } +import Throttler._ +import TimerBasedThrottler._ +import java.util.concurrent.TimeUnit + +/** + * @see [[akka.contrib.throttle.TimerBasedThrottler]] + * @see [[akka.contrib.throttle.Throttler.Rate]] + * @see [[akka.contrib.throttle.Throttler.SetRate]] + * @see [[akka.contrib.throttle.Throttler.SetTarget]] + */ +object Throttler { + /** + * A rate used for throttling. + * + * Scala API: There are some shorthands available to construct rates: + * {{{ + * import java.util.concurrent.TimeUnit._ + * import scala.concurrent.duration.{ Duration, FiniteDuration } + * + * val rate1 = 1 msgsPer (1, SECONDS) + * val rate2 = 1 msgsPer Duration(1, SECONDS) + * val rate3 = 1 msgsPer (1 seconds) + * val rate4 = 1 msgsPerSecond + * val rate5 = 1 msgsPerMinute + * val rate6 = 1 msgsPerHour + * }}} + * + * @param numberOfCalls the number of calls that may take place in a period + * @param duration the length of the period + * @see [[akka.contrib.throttle.Throttler]] + */ + final case class Rate(val numberOfCalls: Int, val duration: FiniteDuration) { + /** + * The duration in milliseconds. + */ + def durationInMillis(): Long = duration.toMillis + } + + /** + * Set the target of a throttler. + * + * You may change a throttler's target at any time. + * + * Notice that the messages sent by the throttler to the target will have the original sender (and + * not the throttler) as the sender. (In Akka terms, the throttler `forward`s the message.) + * + * @param target if `target` is `None`, the throttler will stop delivering messages and the messages already received + * but not yet delivered, as well as any messages received in the future will be queued + * and eventually be delivered when a new target is set. If `target` is not `None`, the currently queued messages + * as well as any messages received in the future will be delivered to the new target at a rate not exceeding the current throttler's rate. + */ + final case class SetTarget(target: Option[ActorRef]) { + /** + * Java API: + * @param target if `target` is `null`, the throttler will stop delivering messages and the messages already received + * but not yet delivered, as well as any messages received in the future will be queued + * and eventually be delivered when a new target is set. If `target` is not `null`, the currently queued messages + * as well as any messages received in the future will be delivered to the new target at a rate not exceeding + * the current throttler's rate. + */ + def this(target: ActorRef) = this(Option(target)) + } + + /** + * Set the rate of a throttler. + * + * You may change a throttler's rate at any time. + * + * @param rate the rate at which messages will be delivered to the target of the throttler + */ + final case class SetRate(rate: Rate) + + /** + * Helper for some syntactic sugar. + * + * @see [[akka.contrib.throttle.Throttler.Rate]] + */ + implicit class RateInt(val numberOfCalls: Int) extends AnyVal { + def msgsPer(duration: Int, timeUnit: TimeUnit) = Rate(numberOfCalls, Duration(duration, timeUnit)) + def msgsPer(duration: FiniteDuration) = Rate(numberOfCalls, duration) + def msgsPerSecond = Rate(numberOfCalls, Duration(1, TimeUnit.SECONDS)) + def msgsPerMinute = Rate(numberOfCalls, Duration(1, TimeUnit.MINUTES)) + def msgsPerHour = Rate(numberOfCalls, Duration(1, TimeUnit.HOURS)) + } + +} + +/** + * INTERNAL API + */ +private[throttle] object TimerBasedThrottler { + case object Tick + + // States of the FSM: A `TimerBasedThrottler` is in state `Active` iff the timer is running. + sealed trait State + case object Idle extends State + case object Active extends State + + // Messages, as we queue them to be sent later + final case class Message(message: Any, sender: ActorRef) + + // The data of the FSM + final case class Data(target: Option[ActorRef], + callsLeftInThisPeriod: Int, + queue: Q[Message]) +} + +/** + * A throttler that uses a timer to control the message delivery rate. + * + * == Throttling == + * A throttler is an actor that is defined through a target actor and a rate + * (of type [[akka.contrib.throttle.Throttler.Rate]]). You set or change the target and rate at any time through the + * [[akka.contrib.throttle.Throttler.SetTarget]] and [[akka.contrib.throttle.Throttler.SetRate]] + * messages, respectively. When you send the throttler any other message `msg`, it will + * put the message `msg` into an internal queue and eventually send all queued messages to the target, at + * a speed that respects the given rate. If no target is currently defined then the messages will be queued + * and will be delivered as soon as a target gets set. + * + * A throttler understands actor messages of type + * [[akka.contrib.throttle.Throttler.SetTarget]], [[akka.contrib.throttle.Throttler.SetRate]], in + * addition to any other messages, which the throttler will consider as messages to be sent to + * the target. + * + * == Transparency == + * Notice that the throttler `forward`s messages, i.e., the target will see the original message sender + * (and not the throttler) as the sender of the message. + * + * == Persistence == + * Throttlers usually use an internal queue to keep the messages that need to be sent to the target. + * You therefore cannot rely on the throttler's inbox size in order to learn how much messages are + * outstanding. + * + * It is left to the implementation whether the internal queue is persisted over application restarts or + * actor failure. + * + * == Processing messages == + * The target should process messages as fast as possible. If the target requires substantial time to + * process messages, it should distribute its work to other actors (using for example something like + * a `BalancingDispatcher`), otherwise the resulting system will always work below + * the threshold rate. + * + * Example: Suppose the throttler has a rate of 3msg/s and the target requires 1s to process a message. + * This system will only process messages at a rate of 1msg/s: the target will receive messages at at most 3msg/s + * but as it handles them synchronously and each of them takes 1s, its inbox will grow and grow. In such + * a situation, the target should distribute its messages to a set of worker actors so that individual messages + * can be handled in parallel. + * + * ==Example== + * For example, if you set a rate like "3 messages in 1 second", the throttler + * will send the first three messages immediately to the target actor but will need to impose a delay before + * sending out further messages: + * {{{ + * // A simple actor that prints whatever it receives + * class Printer extends Actor { + * def receive = { + * case x => println(x) + * } + * } + * + * val printer = system.actorOf(Props[Printer], "printer") + * + * // The throttler for this example, setting the rate + * val throttler = system.actorOf(Props(classOf[TimerBasedThrottler], 3 msgsPer 1.second)) + * + * // Set the target + * throttler ! SetTarget(Some(printer)) + * // These three messages will be sent to the printer immediately + * throttler ! "1" + * throttler ! "2" + * throttler ! "3" + * // These two will wait at least until 1 second has passed + * throttler ! "4" + * throttler ! "5" + * }}} + * + * ==Implementation notes== + * This throttler implementation internally installs a timer that repeats every `rate.durationInMillis` and enables `rate.numberOfCalls` + * additional calls to take place. A `TimerBasedThrottler` uses very few system resources, provided the rate's duration is not too + * fine-grained (which would cause a lot of timer invocations); for example, it does not store the calling history + * as other throttlers may need to do. + * + * However, a `TimerBasedThrottler` only provides ''weak guarantees'' on the rate (see also + * this blog post): + * + * - Only ''delivery'' times are taken into account: if, for example, the throttler is used to throttle + * requests to an external web service then only the start times of the web requests are considered. + * If a web request takes very long on the server then more than `rate.numberOfCalls`-many requests + * may be observed on the server in an interval of duration `rate.durationInMillis()`. + * - There may be intervals of duration `rate.durationInMillis()` that contain more than `rate.numberOfCalls` + * message deliveries: a `TimerBasedThrottler` only makes guarantees for the intervals + * of its ''own'' timer, namely that no more than `rate.numberOfCalls`-many messages are delivered within such intervals. Other intervals on the + * timeline may contain more calls. + * + * For some applications, these guarantees may not be sufficient. + * + * ==Known issues== + * + * - If you change the rate using `SetRate(rate)`, the actual rate may in fact be higher for the + * overlapping period (i.e., `durationInMillis()`) of the new and old rate. Therefore, + * changing the rate frequently is not recommended with the current implementation. + * - The queue of messages to be delivered is not persisted in any way; actor or system failure will + * cause the queued messages to be lost. + * + * @see [[akka.contrib.throttle.Throttler]] + */ +class TimerBasedThrottler(var rate: Rate) extends Actor with FSM[State, Data] { + startWith(Idle, Data(None, rate.numberOfCalls, Q())) + + // Idle: no messages, or target not set + when(Idle) { + // Set the rate + case Event(SetRate(rate), d) ⇒ + this.rate = rate + stay using d.copy(callsLeftInThisPeriod = rate.numberOfCalls) + + // Set the target + case Event(SetTarget(t @ Some(_)), d) if !d.queue.isEmpty ⇒ + goto(Active) using deliverMessages(d.copy(target = t)) + case Event(SetTarget(t), d) ⇒ + stay using d.copy(target = t) + + // Queuing + case Event(msg, d @ Data(None, _, queue)) ⇒ + stay using d.copy(queue = queue.enqueue(Message(msg, context.sender()))) + case Event(msg, d @ Data(Some(_), _, Seq())) ⇒ + goto(Active) using deliverMessages(d.copy(queue = Q(Message(msg, context.sender())))) + // Note: The case Event(msg, t @ Data(Some(_), _, _, Seq(_*))) should never happen here. + } + + when(Active) { + // Set the rate + case Event(SetRate(rate), d) ⇒ + this.rate = rate + // Note: this should be improved (see "Known issues" in class comments) + stopTimer() + startTimer(rate) + stay using d.copy(callsLeftInThisPeriod = rate.numberOfCalls) + + // Set the target (when the new target is None) + case Event(SetTarget(None), d) ⇒ + // Note: We do not yet switch to state `Inactive` because we need the timer to tick once more before + stay using d.copy(target = None) + + // Set the target (when the new target is not None) + case Event(SetTarget(t @ Some(_)), d) ⇒ + stay using d.copy(target = t) + + // Tick after a `SetTarget(None)`: take the additional permits and go to `Idle` + case Event(Tick, d @ Data(None, _, _)) ⇒ + goto(Idle) using d.copy(callsLeftInThisPeriod = rate.numberOfCalls) + + // Period ends and we have no more messages: take the additional permits and go to `Idle` + case Event(Tick, d @ Data(_, _, Seq())) ⇒ + goto(Idle) using d.copy(callsLeftInThisPeriod = rate.numberOfCalls) + + // Period ends and we get more occasions to send messages + case Event(Tick, d @ Data(_, _, _)) ⇒ + stay using deliverMessages(d.copy(callsLeftInThisPeriod = rate.numberOfCalls)) + + // Queue a message (when we cannot send messages in the current period anymore) + case Event(msg, d @ Data(_, 0, queue)) ⇒ + stay using d.copy(queue = queue.enqueue(Message(msg, context.sender()))) + + // Queue a message (when we can send some more messages in the current period) + case Event(msg, d @ Data(_, _, queue)) ⇒ + stay using deliverMessages(d.copy(queue = queue.enqueue(Message(msg, context.sender())))) + } + + onTransition { + case Idle -> Active ⇒ startTimer(rate) + case Active -> Idle ⇒ stopTimer() + } + + initialize() + + private def startTimer(rate: Rate) = setTimer("morePermits", Tick, rate.duration, true) + private def stopTimer() = cancelTimer("morePermits") + + /** + * Send as many messages as we can (while respecting the rate) to the target and + * return the state data (with the queue containing the remaining ones). + */ + private def deliverMessages(data: Data): Data = { + val queue = data.queue + val nrOfMsgToSend = scala.math.min(queue.length, data.callsLeftInThisPeriod) + + queue.take(nrOfMsgToSend).foreach(x ⇒ data.target.get.tell(x.message, x.sender)) + + data.copy(queue = queue.drop(nrOfMsgToSend), callsLeftInThisPeriod = data.callsLeftInThisPeriod - nrOfMsgToSend) + } +} diff --git a/akka-contrib/src/test/scala/akka/contrib/jul/JavaLoggerSpec.scala b/akka-contrib/src/test/scala/akka/contrib/jul/JavaLoggerSpec.scala index 15dc6ba21b..9cdb5985ed 100644 --- a/akka-contrib/src/test/scala/akka/contrib/jul/JavaLoggerSpec.scala +++ b/akka-contrib/src/test/scala/akka/contrib/jul/JavaLoggerSpec.scala @@ -4,10 +4,9 @@ package akka.contrib.jul import com.typesafe.config.ConfigFactory -import akka.actor.{ ActorSystem, Actor, ActorLogging, Props } +import akka.actor.{ Actor, ActorLogging, Props } import akka.testkit.AkkaSpec import java.util.logging -import java.io.ByteArrayInputStream object JavaLoggerSpec { diff --git a/akka-contrib/src/test/scala/akka/contrib/mailbox/PeekMailboxSpec.scala b/akka-contrib/src/test/scala/akka/contrib/mailbox/PeekMailboxSpec.scala index b49078c650..2fdbcc5c6e 100644 --- a/akka-contrib/src/test/scala/akka/contrib/mailbox/PeekMailboxSpec.scala +++ b/akka-contrib/src/test/scala/akka/contrib/mailbox/PeekMailboxSpec.scala @@ -5,7 +5,7 @@ package akka.contrib.mailbox import com.typesafe.config.ConfigFactory -import akka.actor.{ Actor, ActorSystem, DeadLetter, PoisonPill, Props, Terminated, actorRef2Scala } +import akka.actor.{ Actor, ActorSystem, DeadLetter, PoisonPill, Props, actorRef2Scala } import akka.testkit.{ AkkaSpec, EventFilter, ImplicitSender } object PeekMailboxSpec { diff --git a/akka-contrib/src/test/scala/akka/contrib/pattern/ReliableProxyDocSpec.scala b/akka-contrib/src/test/scala/akka/contrib/pattern/ReliableProxyDocSpec.scala index dfe6db183b..5c98448797 100644 --- a/akka-contrib/src/test/scala/akka/contrib/pattern/ReliableProxyDocSpec.scala +++ b/akka-contrib/src/test/scala/akka/contrib/pattern/ReliableProxyDocSpec.scala @@ -6,7 +6,6 @@ package akka.contrib.pattern import akka.testkit.AkkaSpec import akka.actor._ -import akka.testkit.ImplicitSender import scala.concurrent.duration._ import akka.testkit.TestProbe diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/DistributedData.scala b/akka-distributed-data/src/main/scala/akka/cluster/ddata/DistributedData.scala index 6fd75b0bd6..7aafbc66aa 100644 --- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/DistributedData.scala +++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/DistributedData.scala @@ -3,8 +3,6 @@ */ package akka.cluster.ddata -import scala.concurrent.duration._ - import akka.actor.ActorRef import akka.actor.ActorSystem import akka.actor.ExtendedActorSystem diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMap.scala b/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMap.scala index a30d9681e5..66bc02d31c 100644 --- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMap.scala +++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMap.scala @@ -6,7 +6,6 @@ package akka.cluster.ddata import akka.cluster.Cluster import akka.cluster.UniqueAddress import akka.util.HashCode -import akka.japi.function.{ Function ⇒ JFunction } object ORMap { private val _empty: ORMap[ReplicatedData] = new ORMap(ORSet.empty, Map.empty) diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORSet.scala b/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORSet.scala index 7451389917..89fe4edcf5 100644 --- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORSet.scala +++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORSet.scala @@ -4,7 +4,6 @@ package akka.cluster.ddata import scala.annotation.tailrec -import scala.collection.immutable.TreeMap import akka.cluster.Cluster import akka.cluster.UniqueAddress diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/Replicator.scala b/akka-distributed-data/src/main/scala/akka/cluster/ddata/Replicator.scala index 25ab190afc..8bc67711db 100644 --- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/Replicator.scala +++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/Replicator.scala @@ -4,9 +4,7 @@ package akka.cluster.ddata import java.security.MessageDigest -import scala.annotation.tailrec import scala.collection.immutable -import scala.collection.immutable.Queue import scala.collection.mutable import scala.concurrent.duration._ import scala.concurrent.duration.FiniteDuration @@ -1269,7 +1267,6 @@ private[akka] object ReadWriteAggregator { * INTERNAL API */ private[akka] abstract class ReadWriteAggregator extends Actor { - import Replicator.Internal._ import ReadWriteAggregator._ def timeout: FiniteDuration diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/VersionVector.scala b/akka-distributed-data/src/main/scala/akka/cluster/ddata/VersionVector.scala index f2618d7a67..99ee99b68f 100644 --- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/VersionVector.scala +++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/VersionVector.scala @@ -3,7 +3,6 @@ */ package akka.cluster.ddata -import scala.collection.immutable import java.util.concurrent.atomic.AtomicLong import scala.annotation.tailrec import scala.collection.immutable.TreeMap diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializer.scala b/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializer.scala index 0db65fc5c3..41f9d31557 100644 --- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializer.scala +++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializer.scala @@ -12,7 +12,6 @@ import scala.collection.JavaConverters._ import scala.collection.breakOut import akka.actor.ExtendedActorSystem import akka.cluster.ddata._ -import akka.cluster.ddata.Replicator._ import akka.cluster.ddata.Replicator.Internal._ import akka.cluster.ddata.protobuf.msg.{ ReplicatedDataMessages ⇒ rd } import akka.cluster.ddata.protobuf.msg.{ ReplicatorMessages ⇒ dm } diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LocalConcurrencySpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/LocalConcurrencySpec.scala index 4dc3ef03d9..f2c2c22734 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LocalConcurrencySpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/LocalConcurrencySpec.scala @@ -4,8 +4,6 @@ package akka.cluster.ddata -import scala.concurrent.duration._ - import akka.actor.Actor import akka.actor.ActorSystem import akka.actor.Props diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/WriteAggregatorSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/WriteAggregatorSpec.scala index 2c722d16bf..98e0776563 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/WriteAggregatorSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/WriteAggregatorSpec.scala @@ -6,20 +6,13 @@ package akka.cluster.ddata import scala.concurrent.duration._ import akka.actor.Actor -import akka.actor.ActorSystem import akka.actor.Props -import akka.cluster.Cluster import akka.testkit._ -import com.typesafe.config.ConfigFactory -import org.scalatest.BeforeAndAfterAll -import org.scalatest.Matchers -import org.scalatest.WordSpecLike import akka.actor.Address import akka.actor.ActorRef import akka.cluster.ddata.Replicator.Internal._ import akka.cluster.ddata.Replicator._ import akka.actor.ActorSelection -import akka.cluster.UniqueAddress object WriteAggregatorSpec { diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala index badbab479a..8f338f7aff 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala @@ -3,7 +3,6 @@ */ package akka.cluster.ddata.protobuf -import scala.concurrent.duration._ import org.scalatest.BeforeAndAfterAll import org.scalatest.Matchers import org.scalatest.WordSpecLike @@ -20,7 +19,6 @@ import akka.cluster.ddata.ORMultiMap import akka.cluster.ddata.ORSet import akka.cluster.ddata.PNCounter import akka.cluster.ddata.PNCounterMap -import akka.cluster.ddata.Replicator._ import akka.cluster.ddata.Replicator.Internal._ import akka.cluster.ddata.VersionVector import akka.testkit.TestKit diff --git a/akka-docs/rst/scala/code/docs/ddata/DistributedDataDocSpec.scala b/akka-docs/rst/scala/code/docs/ddata/DistributedDataDocSpec.scala index 32a599bdbf..9da5fd3901 100644 --- a/akka-docs/rst/scala/code/docs/ddata/DistributedDataDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/ddata/DistributedDataDocSpec.scala @@ -9,7 +9,6 @@ import akka.actor.Actor import akka.actor.ActorLogging import akka.cluster.Cluster import akka.cluster.ddata._ -import akka.cluster.ddata.Replicator._ import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender import akka.testkit.TestProbe @@ -104,8 +103,6 @@ object DistributedDataDocSpec { class DistributedDataDocSpec extends AkkaSpec(DistributedDataDocSpec.config) { import Replicator._ - import DistributedDataDocSpec._ - "demonstrate update" in { val probe = TestProbe() implicit val self = probe.ref diff --git a/akka-docs/rst/scala/code/docs/ddata/protobuf/TwoPhaseSetSerializer2.scala b/akka-docs/rst/scala/code/docs/ddata/protobuf/TwoPhaseSetSerializer2.scala index 0e87111a93..266782917c 100644 --- a/akka-docs/rst/scala/code/docs/ddata/protobuf/TwoPhaseSetSerializer2.scala +++ b/akka-docs/rst/scala/code/docs/ddata/protobuf/TwoPhaseSetSerializer2.scala @@ -4,7 +4,6 @@ package docs.ddata.protobuf //#serializer -import scala.collection.JavaConverters._ import akka.actor.ExtendedActorSystem import akka.cluster.ddata.GSet import akka.cluster.ddata.protobuf.ReplicatedDataSerializer diff --git a/akka-docs/rst/scala/code/docs/dispatcher/DispatcherDocSpec.scala b/akka-docs/rst/scala/code/docs/dispatcher/DispatcherDocSpec.scala index 8c55177e31..fcba9cb847 100644 --- a/akka-docs/rst/scala/code/docs/dispatcher/DispatcherDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/dispatcher/DispatcherDocSpec.scala @@ -10,7 +10,6 @@ import org.scalatest.Matchers import akka.testkit.AkkaSpec import akka.event.Logging import akka.event.LoggingAdapter -import scala.concurrent.duration._ import akka.actor._ import docs.dispatcher.DispatcherDocSpec.MyBoundedActor import akka.dispatch.RequiresMessageQueue diff --git a/akka-docs/rst/scala/code/docs/extension/ExtensionDocSpec.scala b/akka-docs/rst/scala/code/docs/extension/ExtensionDocSpec.scala index 437c54446c..7a1aa36ad3 100644 --- a/akka-docs/rst/scala/code/docs/extension/ExtensionDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/extension/ExtensionDocSpec.scala @@ -80,7 +80,6 @@ object ExtensionDocSpec { } class ExtensionDocSpec extends AkkaSpec(ExtensionDocSpec.config) { - import ExtensionDocSpec._ "demonstrate how to create an extension in Scala" in { //#extension-usage diff --git a/akka-docs/rst/scala/code/docs/http/scaladsl/WebSocketClientExampleSpec.scala b/akka-docs/rst/scala/code/docs/http/scaladsl/WebSocketClientExampleSpec.scala index 68fcf1ca49..18731f5d85 100644 --- a/akka-docs/rst/scala/code/docs/http/scaladsl/WebSocketClientExampleSpec.scala +++ b/akka-docs/rst/scala/code/docs/http/scaladsl/WebSocketClientExampleSpec.scala @@ -70,7 +70,6 @@ class WebSocketClientExampleSpec extends WordSpec with Matchers { import akka.http.scaladsl.Http import akka.stream.ActorMaterializer import akka.stream.scaladsl._ - import akka.http.scaladsl.model._ import akka.http.scaladsl.model.ws._ implicit val system = ActorSystem() implicit val materializer = ActorMaterializer() diff --git a/akka-docs/rst/scala/code/docs/http/scaladsl/server/DirectiveExamplesSpec.scala b/akka-docs/rst/scala/code/docs/http/scaladsl/server/DirectiveExamplesSpec.scala index 0507c02673..178d24886c 100644 --- a/akka-docs/rst/scala/code/docs/http/scaladsl/server/DirectiveExamplesSpec.scala +++ b/akka-docs/rst/scala/code/docs/http/scaladsl/server/DirectiveExamplesSpec.scala @@ -5,9 +5,7 @@ package docs.http.scaladsl.server import akka.http.scaladsl.server._ -import Directives._ import akka.http.scaladsl.testkit.ScalatestRouteTest -import org.scalatest._ class DirectiveExamplesSpec extends RoutingSpec { diff --git a/akka-docs/rst/scala/code/docs/http/scaladsl/server/directives/PathDirectivesExamplesSpec.scala b/akka-docs/rst/scala/code/docs/http/scaladsl/server/directives/PathDirectivesExamplesSpec.scala index 2cfa564b1c..9a482c8d1f 100644 --- a/akka-docs/rst/scala/code/docs/http/scaladsl/server/directives/PathDirectivesExamplesSpec.scala +++ b/akka-docs/rst/scala/code/docs/http/scaladsl/server/directives/PathDirectivesExamplesSpec.scala @@ -4,7 +4,6 @@ package docs.http.scaladsl.server.directives -import akka.http.scaladsl.model.StatusCodes._ import akka.http.scaladsl.server._ import docs.http.scaladsl.server.RoutingSpec diff --git a/akka-docs/rst/scala/code/docs/io/ScalaUdpMulticast.scala b/akka-docs/rst/scala/code/docs/io/ScalaUdpMulticast.scala index 52462c9307..09f23b9b3b 100644 --- a/akka-docs/rst/scala/code/docs/io/ScalaUdpMulticast.scala +++ b/akka-docs/rst/scala/code/docs/io/ScalaUdpMulticast.scala @@ -9,7 +9,7 @@ import java.net.DatagramSocket import java.nio.channels.DatagramChannel import akka.actor.{ Actor, ActorLogging, ActorRef } -import akka.io.Inet.{ DatagramChannelCreator, SocketOption, SocketOptionV2 } +import akka.io.Inet.{ DatagramChannelCreator, SocketOptionV2 } import akka.io.{ IO, Udp } import akka.util.ByteString diff --git a/akka-docs/rst/scala/code/docs/persistence/PersistencePluginDocSpec.scala b/akka-docs/rst/scala/code/docs/persistence/PersistencePluginDocSpec.scala index 59d2eda542..1097121ac7 100644 --- a/akka-docs/rst/scala/code/docs/persistence/PersistencePluginDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/persistence/PersistencePluginDocSpec.scala @@ -5,7 +5,6 @@ package docs.persistence import scala.collection.immutable -import akka.actor.Actor.Receive import akka.actor.ActorSystem import akka.testkit.TestKit import com.typesafe.config._ diff --git a/akka-docs/rst/scala/code/docs/persistence/query/PersistenceQueryDocSpec.scala b/akka-docs/rst/scala/code/docs/persistence/query/PersistenceQueryDocSpec.scala index cd9aa6d4e6..9d7084a097 100644 --- a/akka-docs/rst/scala/code/docs/persistence/query/PersistenceQueryDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/persistence/query/PersistenceQueryDocSpec.scala @@ -13,7 +13,7 @@ import akka.stream.scaladsl.{ Flow, Sink, Source } import akka.stream.javadsl import akka.testkit.AkkaSpec import akka.util.Timeout -import docs.persistence.query.PersistenceQueryDocSpec.{ DummyStore, TheOneWhoWritesToQueryJournal } +import docs.persistence.query.PersistenceQueryDocSpec.{ TheOneWhoWritesToQueryJournal } import org.reactivestreams.Subscriber import scala.collection.immutable import scala.concurrent.Future diff --git a/akka-docs/rst/scala/code/docs/routing/RouterDocSpec.scala b/akka-docs/rst/scala/code/docs/routing/RouterDocSpec.scala index 3082a46cb0..a53740eb1c 100644 --- a/akka-docs/rst/scala/code/docs/routing/RouterDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/routing/RouterDocSpec.scala @@ -4,7 +4,6 @@ package docs.routing import scala.concurrent.duration._ -import scala.collection.JavaConverters._ import akka.testkit._ import akka.actor.{ ActorRef, Props, Actor } import akka.actor.Terminated diff --git a/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeCollectingMetrics.scala b/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeCollectingMetrics.scala index dcad4e53fe..37d98f339d 100644 --- a/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeCollectingMetrics.scala +++ b/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeCollectingMetrics.scala @@ -1,15 +1,11 @@ package docs.stream.cookbook import akka.stream.{ ActorMaterializerSettings, ActorMaterializer } -import akka.stream.scaladsl._ -import akka.stream.testkit._ import scala.collection.immutable import scala.concurrent.Await -import scala.concurrent.duration._ class RecipeCollectingMetrics extends RecipeSpec { - import HoldOps._ implicit val m2 = ActorMaterializer(ActorMaterializerSettings(system).withInputBuffer(1, 1)) "Recipe for periodically collecting metrics" must { diff --git a/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeDroppyBroadcast.scala b/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeDroppyBroadcast.scala index 7c779de869..704309629d 100644 --- a/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeDroppyBroadcast.scala +++ b/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeDroppyBroadcast.scala @@ -6,7 +6,6 @@ import akka.stream.testkit._ import scala.collection.immutable import scala.concurrent.Await -import scala.concurrent.duration._ class RecipeDroppyBroadcast extends RecipeSpec { diff --git a/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeGlobalRateLimit.scala b/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeGlobalRateLimit.scala index c251b86693..9fbe45002a 100644 --- a/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeGlobalRateLimit.scala +++ b/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeGlobalRateLimit.scala @@ -2,7 +2,6 @@ package docs.stream.cookbook import akka.NotUsed import akka.actor.{ Props, ActorRef, Actor } -import akka.actor.Actor.Receive import akka.stream.ClosedShape import akka.stream.scaladsl._ import akka.stream.testkit._ diff --git a/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeKeepAlive.scala b/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeKeepAlive.scala index 5375c14e46..532628a421 100644 --- a/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeKeepAlive.scala +++ b/akka-docs/rst/scala/code/docs/stream/cookbook/RecipeKeepAlive.scala @@ -3,7 +3,6 @@ package docs.stream.cookbook import akka.NotUsed import akka.stream.ClosedShape import akka.stream.scaladsl._ -import akka.stream.testkit._ import akka.util.ByteString class RecipeKeepAlive extends RecipeSpec { diff --git a/akka-http-core/src/main/scala/akka/http/impl/engine/client/OutgoingConnectionBlueprint.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/client/OutgoingConnectionBlueprint.scala index c712320fdc..179d1c83ea 100644 --- a/akka-http-core/src/main/scala/akka/http/impl/engine/client/OutgoingConnectionBlueprint.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/client/OutgoingConnectionBlueprint.scala @@ -23,7 +23,6 @@ import akka.http.impl.util._ import akka.stream.stage.GraphStage import akka.stream.stage.GraphStageLogic import akka.stream.stage.{ InHandler, OutHandler } -import akka.stream.impl.fusing.SubSource /** * INTERNAL API diff --git a/akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolConductor.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolConductor.scala index 0a24a1d065..7a87a9899a 100644 --- a/akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolConductor.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolConductor.scala @@ -12,7 +12,6 @@ import akka.stream.scaladsl._ import akka.stream._ import akka.http.scaladsl.util.FastFuture import akka.http.scaladsl.model.HttpMethod -import akka.http.impl.util._ import akka.stream.stage.GraphStage import akka.stream.stage.GraphStageLogic import akka.stream.stage.InHandler diff --git a/akka-http-core/src/main/scala/akka/http/impl/util/package.scala b/akka-http-core/src/main/scala/akka/http/impl/util/package.scala index 098928d1ac..6edebededb 100644 --- a/akka-http-core/src/main/scala/akka/http/impl/util/package.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/util/package.scala @@ -7,7 +7,6 @@ package akka.http.impl import akka.NotUsed import language.implicitConversions -import language.higherKinds import java.nio.charset.Charset import com.typesafe.config.Config import akka.stream.scaladsl.{ Flow, Source } diff --git a/akka-http-core/src/main/scala/akka/http/javadsl/Http.scala b/akka-http-core/src/main/scala/akka/http/javadsl/Http.scala index 7a6fa6e3ab..985dcb45d6 100644 --- a/akka-http-core/src/main/scala/akka/http/javadsl/Http.scala +++ b/akka-http-core/src/main/scala/akka/http/javadsl/Http.scala @@ -12,7 +12,6 @@ import akka.http.javadsl.model.ws._ import akka.http.javadsl.settings.{ ConnectionPoolSettings, ClientConnectionSettings, ServerSettings } import akka.{ NotUsed, stream } import akka.stream.TLSProtocol._ -import scala.language.implicitConversions import scala.concurrent.Future import scala.util.Try import akka.stream.scaladsl.Keep diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/model/ContentRange.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/ContentRange.scala index 66cb8a1959..087e5de8e7 100644 --- a/akka-http-core/src/main/scala/akka/http/scaladsl/model/ContentRange.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/ContentRange.scala @@ -5,7 +5,6 @@ package akka.http.scaladsl.model import java.util.{ OptionalLong, Optional } -import java.{ lang ⇒ jl } import akka.http.impl.util.{ Rendering, ValueRenderable } import akka.http.javadsl.{ model ⇒ jm } import scala.compat.java8.OptionConverters._ @@ -75,4 +74,4 @@ object ContentRange { /** Java API */ override def getOtherValue: Optional[String] = Optional.of(value) } -} \ No newline at end of file +} diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpEntity.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpEntity.scala old mode 100755 new mode 100644 index cccb73ada4..8ade900787 --- a/akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpEntity.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/HttpEntity.scala @@ -8,7 +8,7 @@ import java.util.OptionalLong import language.implicitConversions import java.io.File -import java.lang.{ Iterable ⇒ JIterable, Long ⇒ JLong } +import java.lang.{ Iterable ⇒ JIterable} import scala.util.control.NonFatal import scala.concurrent.Future import scala.concurrent.duration._ @@ -17,7 +17,7 @@ import akka.util.ByteString import akka.stream.scaladsl._ import akka.stream.stage._ import akka.stream._ -import akka.{ NotUsed, japi, stream } +import akka.{ NotUsed, stream } import akka.http.scaladsl.model.ContentType.{ NonBinary, Binary } import akka.http.scaladsl.util.FastFuture import akka.http.javadsl.{ model ⇒ jm } diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/model/MediaType.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/MediaType.scala index 79d9b8555b..322a766929 100644 --- a/akka-http-core/src/main/scala/akka/http/scaladsl/model/MediaType.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/MediaType.scala @@ -4,7 +4,6 @@ package akka.http.scaladsl.model -import language.implicitConversions import akka.http.impl.util._ import akka.http.javadsl.{ model ⇒ jm } import akka.http.impl.util.JavaMapping.Implicits._ @@ -477,4 +476,4 @@ object MediaTypes extends ObjectRegistry[(String, String), MediaType] { val `video/x-sgi-movie` = vid("x-sgi-movie", "movie", "mv") val `video/webm` = vid("webm", "webm") // format: ON -} \ No newline at end of file +} diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/LanguageRange.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/LanguageRange.scala index d1391ed50e..c92038ed5f 100644 --- a/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/LanguageRange.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/headers/LanguageRange.scala @@ -10,7 +10,6 @@ import akka.http.impl.util._ import akka.http.scaladsl.model.WithQValue import akka.http.javadsl.{ model ⇒ jm } import akka.http.impl.util.JavaMapping.Implicits._ -import akka.japi sealed trait LanguageRange extends jm.headers.LanguageRange with ValueRenderable with WithQValue[LanguageRange] { def qValue: Float @@ -73,4 +72,4 @@ object Language { new Language(tags.head, immutable.Seq(tags.tail: _*)) } else new Language(compoundTag, immutable.Seq.empty) def apply(primaryTag: String, subTags: String*): Language = new Language(primaryTag, immutable.Seq(subTags: _*)) -} \ No newline at end of file +} diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/util/FastFuture.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/util/FastFuture.scala index c721f00851..fad9734d40 100644 --- a/akka-http-core/src/main/scala/akka/http/scaladsl/util/FastFuture.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/util/FastFuture.scala @@ -4,7 +4,7 @@ package akka.http.scaladsl.util -import scala.language.{ implicitConversions, higherKinds } +import scala.language.{ higherKinds } import scala.util.control.NonFatal import scala.util.{ Failure, Success, Try } import scala.collection.generic.CanBuildFrom @@ -119,4 +119,4 @@ object FastFuture { val fb = fn(a.asInstanceOf[A]) for (r ← fr.fast; b ← fb.fast) yield r += b }.fast.map(_.result()) -} \ No newline at end of file +} diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/client/ClientCancellationSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/client/ClientCancellationSpec.scala index e003ede18c..a0dfb8cd61 100644 --- a/akka-http-core/src/test/scala/akka/http/impl/engine/client/ClientCancellationSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/client/ClientCancellationSpec.scala @@ -3,7 +3,7 @@ package akka.http.impl.engine.client import javax.net.ssl.SSLContext import akka.http.scaladsl.{ ConnectionContext, Http } -import akka.http.scaladsl.model.{ HttpHeader, HttpResponse, HttpRequest } +import akka.http.scaladsl.model.{ HttpResponse, HttpRequest } import akka.stream.ActorMaterializer import akka.stream.scaladsl.{ Flow, Sink, Source } import akka.stream.testkit.{ TestSubscriber, TestPublisher, AkkaSpec, TestUtils, Utils } diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/client/ConnectionPoolSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/client/ConnectionPoolSpec.scala index 27eb9f4f7b..3114b15498 100644 --- a/akka-http-core/src/test/scala/akka/http/impl/engine/client/ConnectionPoolSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/client/ConnectionPoolSpec.scala @@ -18,7 +18,7 @@ import akka.util.ByteString import akka.http.scaladsl.{ TestUtils, Http } import akka.http.impl.util.{ SingletonException, StreamUtils } import akka.http.scaladsl.settings.{ ClientConnectionSettings, ConnectionPoolSettings, ServerSettings } -import akka.stream.{ BidiShape, ActorMaterializer } +import akka.stream.{ ActorMaterializer } import akka.stream.TLSProtocol._ import akka.stream.testkit.{ TestPublisher, TestSubscriber, AkkaSpec } import akka.stream.scaladsl._ diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/rendering/ResponseRendererSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/rendering/ResponseRendererSpec.scala index 81505350ea..421fdfb6c3 100644 --- a/akka-http-core/src/test/scala/akka/http/impl/engine/rendering/ResponseRendererSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/rendering/ResponseRendererSpec.scala @@ -26,7 +26,6 @@ class ResponseRendererSpec extends FreeSpec with Matchers with BeforeAndAfterAll akka.event-handlers = ["akka.testkit.TestEventListener"] akka.loglevel = WARNING""") implicit val system = ActorSystem(getClass.getSimpleName, testConf) - import system.dispatcher val ServerOnTheMove = StatusCodes.custom(330, "Server on the move") implicit val materializer = ActorMaterializer() diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/server/PrepareRequestsSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/server/PrepareRequestsSpec.scala index e44d1d4762..a487eb0d31 100644 --- a/akka-http-core/src/test/scala/akka/http/impl/engine/server/PrepareRequestsSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/server/PrepareRequestsSpec.scala @@ -13,7 +13,6 @@ import akka.stream.scaladsl.{ Sink, Source, Flow } import akka.stream.testkit.{ TestSubscriber, TestPublisher } import akka.testkit.AkkaSpec import akka.util.ByteString -import org.scalatest.{ Matchers, WordSpec } import scala.concurrent.duration._ class PrepareRequestsSpec extends AkkaSpec { diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/ws/MessageSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/MessageSpec.scala index 96ca45c3a6..e507d180e7 100644 --- a/akka-http-core/src/test/scala/akka/http/impl/engine/ws/MessageSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/MessageSpec.scala @@ -9,7 +9,6 @@ import akka.NotUsed import scala.concurrent.duration._ import scala.util.Random import org.scalatest.{ Matchers, FreeSpec } -import akka.stream.FlowShape import akka.stream.scaladsl._ import akka.stream.testkit._ import akka.util.ByteString diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/ws/WSTestSetupBase.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/WSTestSetupBase.scala index c0d171ba9e..72a27b31e5 100644 --- a/akka-http-core/src/test/scala/akka/http/impl/engine/ws/WSTestSetupBase.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/WSTestSetupBase.scala @@ -9,7 +9,6 @@ import akka.http.impl.engine.ws.WSTestUtils._ import akka.util.ByteString import org.scalatest.Matchers -import scala.annotation.tailrec import scala.util.Random trait WSTestSetupBase extends Matchers { diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/ws/WebSocketIntegrationSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/WebSocketIntegrationSpec.scala index 77d1c36c73..e0805bd22a 100644 --- a/akka-http-core/src/test/scala/akka/http/impl/engine/ws/WebSocketIntegrationSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/WebSocketIntegrationSpec.scala @@ -20,16 +20,13 @@ import org.scalatest.concurrent.Eventually import java.net.InetSocketAddress import akka.stream.impl.fusing.GraphStages import akka.util.ByteString -import akka.http.scaladsl.model.StatusCodes import akka.stream.testkit.scaladsl.TestSink -import scala.concurrent.Future import akka.testkit.EventFilter class WebSocketIntegrationSpec extends AkkaSpec("akka.stream.materializer.debug.fuzzing-mode=off") with ScalaFutures with ConversionCheckedTripleEquals with Eventually { implicit val patience = PatienceConfig(3.seconds) - import system.dispatcher implicit val materializer = ActorMaterializer() "A WebSocket server" must { diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/ws/WebSocketServerSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/WebSocketServerSpec.scala index 49a4a182bc..225ee3f1ec 100644 --- a/akka-http-core/src/test/scala/akka/http/impl/engine/ws/WebSocketServerSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/WebSocketServerSpec.scala @@ -10,12 +10,9 @@ import akka.stream.testkit.Utils import akka.util.ByteString import org.scalatest.{ Matchers, FreeSpec } -import akka.http.impl.util._ - import akka.http.impl.engine.server.HttpServerTestSetupBase class WebSocketServerSpec extends FreeSpec with Matchers with WithMaterializerSpec { spec ⇒ - import WSTestUtils._ "The server-side WebSocket integration should" - { "establish a websocket connection when the user requests it" - { diff --git a/akka-http-core/src/test/scala/akka/http/javadsl/HttpExtensionApiSpec.scala b/akka-http-core/src/test/scala/akka/http/javadsl/HttpExtensionApiSpec.scala index 079e60fd4b..8376ed3840 100644 --- a/akka-http-core/src/test/scala/akka/http/javadsl/HttpExtensionApiSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/javadsl/HttpExtensionApiSpec.scala @@ -8,7 +8,6 @@ import java.util.Optional import java.util.concurrent.{ CompletionStage, TimeUnit, CompletableFuture } import akka.NotUsed -import akka.http.impl.util.JavaMapping.HttpsConnectionContext import akka.http.javadsl.ConnectHttp._ import akka.http.javadsl.model.ws._ import akka.http.javadsl.settings.{ ClientConnectionSettings, ConnectionPoolSettings, ServerSettings } @@ -18,14 +17,12 @@ import akka.event.NoLogging import akka.http.javadsl.model._ import akka.http.scaladsl.TestUtils import akka.japi.Function -import akka.stream.{ Materializer, ActorMaterializer } +import akka.stream.{ ActorMaterializer } import akka.stream.javadsl.{ Source, Flow, Sink, Keep } import akka.stream.testkit.TestSubscriber -import com.typesafe.config.{ Config, ConfigFactory } +import com.typesafe.config.{ ConfigFactory } import org.scalatest.{ WordSpec, Matchers, BeforeAndAfterAll } import org.scalatest.concurrent.ScalaFutures -import scala.concurrent.{ Future, Await } -import scala.concurrent.duration._ import scala.util.Try class HttpExtensionApiSpec extends WordSpec with Matchers with BeforeAndAfterAll with ScalaFutures { diff --git a/akka-http-core/src/test/scala/akka/http/scaladsl/ClientSpec.scala b/akka-http-core/src/test/scala/akka/http/scaladsl/ClientSpec.scala index 61bdcee627..1c020f24c6 100644 --- a/akka-http-core/src/test/scala/akka/http/scaladsl/ClientSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/scaladsl/ClientSpec.scala @@ -4,11 +4,7 @@ package akka.http.scaladsl -import java.util.concurrent.ConcurrentHashMap - import akka.actor.ActorSystem -import akka.http.impl.engine.client.PoolGateway -import akka.http.impl.settings.HostConnectionPoolSetup import akka.http.scaladsl.model._ import akka.http.scaladsl.model.HttpMethods._ import akka.stream.ActorMaterializer @@ -16,7 +12,7 @@ import com.typesafe.config.{ Config, ConfigFactory } import org.scalatest.{ Matchers, WordSpec } import scala.concurrent.duration._ -import scala.concurrent.{ Await, Future } +import scala.concurrent.{ Await } class ClientSpec extends WordSpec with Matchers { val testConf: Config = ConfigFactory.parseString(""" @@ -27,7 +23,6 @@ class ClientSpec extends WordSpec with Matchers { akka.log-dead-letters = OFF akka.http.server.request-timeout = infinite""") implicit val system = ActorSystem(getClass.getSimpleName, testConf) - import system.dispatcher implicit val materializer = ActorMaterializer() "HTTP Client" should { diff --git a/akka-http-core/src/test/scala/akka/http/scaladsl/model/MultipartSpec.scala b/akka-http-core/src/test/scala/akka/http/scaladsl/model/MultipartSpec.scala index 1e966708b3..2b35b8e4b4 100644 --- a/akka-http-core/src/test/scala/akka/http/scaladsl/model/MultipartSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/scaladsl/model/MultipartSpec.scala @@ -20,7 +20,6 @@ class MultipartSpec extends WordSpec with Matchers with Inside with BeforeAndAft akka.event-handlers = ["akka.testkit.TestEventListener"] akka.loglevel = WARNING""") implicit val system = ActorSystem(getClass.getSimpleName, testConf) - import system.dispatcher implicit val materializer = ActorMaterializer() override def afterAll() = system.terminate() diff --git a/akka-http-core/src/test/scala/io/akka/integrationtest/http/HttpModelIntegrationSpec.scala b/akka-http-core/src/test/scala/io/akka/integrationtest/http/HttpModelIntegrationSpec.scala index 5837adfdd7..e482e9a766 100644 --- a/akka-http-core/src/test/scala/io/akka/integrationtest/http/HttpModelIntegrationSpec.scala +++ b/akka-http-core/src/test/scala/io/akka/integrationtest/http/HttpModelIntegrationSpec.scala @@ -38,7 +38,6 @@ class HttpModelIntegrationSpec extends WordSpec with Matchers with BeforeAndAfte akka.event-handlers = ["akka.testkit.TestEventListener"] akka.loglevel = WARNING""") implicit val system = ActorSystem(getClass.getSimpleName, testConf) - import system.dispatcher override def afterAll() = system.terminate() diff --git a/akka-http-testkit/src/main/scala/akka/http/scaladsl/testkit/RouteTestResultComponent.scala b/akka-http-testkit/src/main/scala/akka/http/scaladsl/testkit/RouteTestResultComponent.scala index 5c729427f2..44cae149f9 100644 --- a/akka-http-testkit/src/main/scala/akka/http/scaladsl/testkit/RouteTestResultComponent.scala +++ b/akka-http-testkit/src/main/scala/akka/http/scaladsl/testkit/RouteTestResultComponent.scala @@ -5,11 +5,10 @@ package akka.http.scaladsl.testkit import java.util.concurrent.CountDownLatch -import akka.dispatch.ExecutionContexts import scala.collection.immutable import scala.concurrent.duration._ -import scala.concurrent.{ Await, ExecutionContext } +import scala.concurrent.{ ExecutionContext } import akka.stream.Materializer import akka.stream.scaladsl._ import akka.http.scaladsl.model.HttpEntity.ChunkStreamPart @@ -97,4 +96,4 @@ trait RouteTestResultComponent { private def awaitAllElements[T](data: Source[T, _]): immutable.Seq[T] = data.limit(100000).runWith(Sink.seq).awaitResult(timeout) } -} \ No newline at end of file +} diff --git a/akka-http-tests/src/test/scala/akka/http/scaladsl/server/StreamingResponseSpecs.scala b/akka-http-tests/src/test/scala/akka/http/scaladsl/server/StreamingResponseSpecs.scala index 39bd93379d..a4995f9446 100644 --- a/akka-http-tests/src/test/scala/akka/http/scaladsl/server/StreamingResponseSpecs.scala +++ b/akka-http-tests/src/test/scala/akka/http/scaladsl/server/StreamingResponseSpecs.scala @@ -12,7 +12,6 @@ class StreamingResponseSpecs extends RoutingSpec { "streaming ByteString responses" should { "should render empty string if stream was empty" in { - import StatusCodes._ val src = Source.empty[ByteString] val entity = HttpEntity.Chunked.fromData(ContentTypes.`application/json`, src) @@ -26,4 +25,4 @@ class StreamingResponseSpecs extends RoutingSpec { } } -} \ No newline at end of file +} diff --git a/akka-http-tests/src/test/scala/akka/http/scaladsl/server/TcpLeakApp.scala b/akka-http-tests/src/test/scala/akka/http/scaladsl/server/TcpLeakApp.scala index f42d623bb1..9f42e191c5 100644 --- a/akka-http-tests/src/test/scala/akka/http/scaladsl/server/TcpLeakApp.scala +++ b/akka-http-tests/src/test/scala/akka/http/scaladsl/server/TcpLeakApp.scala @@ -24,7 +24,6 @@ object TcpLeakApp extends App { import system.dispatcher - import scala.concurrent.duration._ val tcpFlow = Tcp().outgoingConnection(new InetSocketAddress("127.0.0.1", 1234)).named("TCP-outgoingConnection") List .fill(100)( diff --git a/akka-http-tests/src/test/scala/akka/http/scaladsl/server/TestServer.scala b/akka-http-tests/src/test/scala/akka/http/scaladsl/server/TestServer.scala index bb5c92a4a3..86a404fe80 100644 --- a/akka-http-tests/src/test/scala/akka/http/scaladsl/server/TestServer.scala +++ b/akka-http-tests/src/test/scala/akka/http/scaladsl/server/TestServer.scala @@ -6,7 +6,6 @@ package akka.http.scaladsl.server import akka.http.scaladsl.marshallers.xml.ScalaXmlSupport import akka.http.scaladsl.server.directives.Credentials -import akka.stream.scaladsl._ import com.typesafe.config.{ ConfigFactory, Config } import akka.actor.ActorSystem import akka.stream.ActorMaterializer diff --git a/akka-http-tests/src/test/scala/akka/http/scaladsl/server/directives/RespondWithDirectivesSpec.scala b/akka-http-tests/src/test/scala/akka/http/scaladsl/server/directives/RespondWithDirectivesSpec.scala index 023b5605ef..e28cc21899 100644 --- a/akka-http-tests/src/test/scala/akka/http/scaladsl/server/directives/RespondWithDirectivesSpec.scala +++ b/akka-http-tests/src/test/scala/akka/http/scaladsl/server/directives/RespondWithDirectivesSpec.scala @@ -5,9 +5,7 @@ package akka.http.scaladsl.server.directives import akka.http.scaladsl.model._ -import MediaTypes._ import headers._ -import StatusCodes._ import akka.http.scaladsl.server._ diff --git a/akka-http/src/main/scala/akka/http/impl/server/FormFieldImpl.scala b/akka-http/src/main/scala/akka/http/impl/server/FormFieldImpl.scala index ef6149c1a1..01ff7d21c2 100644 --- a/akka-http/src/main/scala/akka/http/impl/server/FormFieldImpl.scala +++ b/akka-http/src/main/scala/akka/http/impl/server/FormFieldImpl.scala @@ -12,7 +12,6 @@ import akka.http.scaladsl.common.{ StrictForm, NameUnmarshallerReceptacle, NameR import akka.http.scaladsl.unmarshalling._ import scala.reflect.ClassTag -import akka.http.scaladsl.server.directives.FormFieldDirectives._ import akka.http.scaladsl.server.{ Directives, Directive1 } import scala.compat.java8.OptionConverters._ @@ -51,4 +50,4 @@ object FormFieldImpl { def apply[T, U](receptacle: NameUnmarshallerReceptacle[T])(implicit tTag: ClassTag[U], conv: T ⇒ U): FormField[U] = apply(new NameReceptacle[T](receptacle.name))(StrictForm.Field.unmarshallerFromFSU(receptacle.um), tTag, conv) -} \ No newline at end of file +} diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/Directives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/Directives.scala index d84ad79a3c..aeea437ffd 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/server/Directives.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/server/Directives.scala @@ -6,8 +6,6 @@ package akka.http.javadsl.server import akka.http.javadsl.server.directives._ import scala.collection.immutable -import scala.annotation.varargs -import akka.http.javadsl.model.HttpMethods abstract class AllDirectives extends WebSocketDirectives diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/RequestVal.scala b/akka-http/src/main/scala/akka/http/javadsl/server/RequestVal.scala index 1e16af1af8..5c612f8c83 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/server/RequestVal.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/server/RequestVal.scala @@ -4,8 +4,6 @@ package akka.http.javadsl.server -import akka.http.javadsl.server.values.{ PathMatcher, HttpBasicAuthenticator } - /** * Represents a value that can be extracted from a request. */ diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/Unmarshallers.scala b/akka-http/src/main/scala/akka/http/javadsl/server/Unmarshallers.scala index 602e5e4345..2b185cf5ec 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/server/Unmarshallers.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/server/Unmarshallers.scala @@ -8,7 +8,6 @@ import akka.http.impl.server.{ Util, UnmarshallerImpl } import akka.http.javadsl.model.{ HttpEntity, HttpMessage } import akka.http.scaladsl.unmarshalling.{ Unmarshaller ⇒ ScalaUnmarshaller, FromMessageUnmarshaller } import akka.japi.function.Function -import akka.stream.Materializer import akka.util.ByteString import scala.reflect.ClassTag diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/CodingDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/CodingDirectives.scala index 0fc5cbc710..2799b948bd 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/CodingDirectives.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/CodingDirectives.scala @@ -8,7 +8,6 @@ package directives import akka.http.javadsl.server.Directive import akka.http.javadsl.server.Directives import akka.http.javadsl.server.Route -import akka.http.scaladsl.coding.Decoder import akka.http.scaladsl.server._ import scala.annotation.varargs @@ -71,4 +70,4 @@ private[http] object CodingDirectives { private[http] val _DefaultCodersToDecodeRequest = scaladsl.server.directives.CodingDirectives.DefaultCoders .map(c ⇒ Coder.values().find(_._underlyingScalaCoder() == c).get) -} \ No newline at end of file +} diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/FileAndResourceDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/FileAndResourceDirectives.scala index a137972876..09d24fb69b 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/FileAndResourceDirectives.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/FileAndResourceDirectives.scala @@ -5,7 +5,7 @@ package akka.http.javadsl.server.directives import java.io.File -import akka.http.javadsl.model.{ MediaType, ContentType } +import akka.http.javadsl.model.{ ContentType } import akka.http.javadsl.server.Route import akka.http.scaladsl.server import akka.http.impl.server.RouteStructure._ diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/values/HttpBasicAuthenticator.scala b/akka-http/src/main/scala/akka/http/javadsl/server/values/HttpBasicAuthenticator.scala index 61eac8d917..e310bfb729 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/server/values/HttpBasicAuthenticator.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/server/values/HttpBasicAuthenticator.scala @@ -6,7 +6,6 @@ package akka.http.javadsl.server.values import akka.http.impl.server.{ ExtractionImplBase, RouteStructure } import akka.http.javadsl.server.{ AbstractDirective, RequestVal, Route } -import akka.http.scaladsl.util.FastFuture import scala.reflect.ClassTag import java.util.concurrent.CompletionStage import java.util.Optional diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/values/PathMatchers.scala b/akka-http/src/main/scala/akka/http/javadsl/server/values/PathMatchers.scala index c4dbd698f0..1c6cebb214 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/server/values/PathMatchers.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/server/values/PathMatchers.scala @@ -5,17 +5,15 @@ package akka.http.javadsl.server.values import java.util.Optional -import java.util.regex.Pattern import java.{ lang ⇒ jl, util ⇒ ju } import akka.http.impl.server.PathMatcherImpl import akka.http.javadsl.server.RequestVal -import akka.http.scaladsl.server.{ PathMatcher0, PathMatcher1, PathMatchers ⇒ ScalaPathMatchers, PathMatcher ⇒ ScalaPathMatcher } +import akka.http.scaladsl.server.{ PathMatcher0, PathMatcher1, PathMatchers ⇒ ScalaPathMatchers } import akka.japi.function.Function import scala.collection.JavaConverters._ import scala.reflect.ClassTag -import scala.util.matching.Regex /** * A PathMatcher is used to match the (yet unmatched) URI path of incoming requests. diff --git a/akka-http/src/main/scala/akka/http/scaladsl/coding/Decoder.scala b/akka-http/src/main/scala/akka/http/scaladsl/coding/Decoder.scala index c7bbcc5ea9..dd905691c9 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/coding/Decoder.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/coding/Decoder.scala @@ -7,7 +7,7 @@ package akka.http.scaladsl.coding import akka.NotUsed import akka.http.scaladsl.model._ import akka.stream.{ FlowShape, Materializer } -import akka.stream.stage.{ GraphStage, Stage } +import akka.stream.stage.{ GraphStage} import akka.util.ByteString import headers.HttpEncoding import akka.stream.scaladsl.{ Sink, Source, Flow } diff --git a/akka-http/src/main/scala/akka/http/scaladsl/coding/Gzip.scala b/akka-http/src/main/scala/akka/http/scaladsl/coding/Gzip.scala index 69b9caad9f..8613630845 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/coding/Gzip.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/coding/Gzip.scala @@ -6,7 +6,6 @@ package akka.http.scaladsl.coding import java.util.zip.{ CRC32, Deflater, Inflater, ZipException } -import akka.http.impl.engine.ws.{ ProtocolException, FrameEvent } import akka.http.scaladsl.model._ import akka.http.scaladsl.model.headers.HttpEncodings import akka.stream.Attributes diff --git a/akka-http/src/main/scala/akka/http/scaladsl/coding/NoCoding.scala b/akka-http/src/main/scala/akka/http/scaladsl/coding/NoCoding.scala index cf0246c659..b48518182e 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/coding/NoCoding.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/coding/NoCoding.scala @@ -7,7 +7,7 @@ package akka.http.scaladsl.coding import akka.http.scaladsl.model._ import akka.http.impl.util.StreamUtils import akka.stream.FlowShape -import akka.stream.stage.{ GraphStage, Stage } +import akka.stream.stage.{ GraphStage} import akka.util.ByteString import headers.HttpEncodings diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileUploadDirectives.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileUploadDirectives.scala index 17170a99a5..da7caa4b03 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileUploadDirectives.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileUploadDirectives.scala @@ -9,7 +9,7 @@ import akka.http.scaladsl.server.{ MissingFormFieldRejection, Directive1 } import akka.http.scaladsl.model.{ ContentType, Multipart } import akka.util.ByteString import scala.concurrent.Future -import scala.util.{ Failure, Success, Try } +import scala.util.{ Failure, Success } import akka.stream.scaladsl._ trait FileUploadDirectives { diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/MarshallingDirectives.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/MarshallingDirectives.scala index c073e8884e..9aea4ee3f5 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/MarshallingDirectives.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/MarshallingDirectives.scala @@ -5,15 +5,10 @@ package akka.http.scaladsl.server package directives -import akka.actor.ActorSystem -import akka.http.scaladsl.settings.ParserSettings -import akka.http.scaladsl.model.Multipart -import akka.http.scaladsl.model.Multipart.ByteRanges - import scala.concurrent.Promise import scala.util.{ Failure, Success } import akka.http.scaladsl.marshalling.ToResponseMarshaller -import akka.http.scaladsl.unmarshalling.{ FromEntityUnmarshaller, MultipartUnmarshallers, Unmarshaller, FromRequestUnmarshaller } +import akka.http.scaladsl.unmarshalling.{ Unmarshaller, FromRequestUnmarshaller } import akka.http.impl.util._ trait MarshallingDirectives { @@ -50,8 +45,6 @@ trait MarshallingDirectives { */ def completeWith[T](marshaller: ToResponseMarshaller[T])(inner: (T ⇒ Unit) ⇒ Unit): Route = extractRequestContext { ctx ⇒ - import ctx.executionContext - import ctx.materializer implicit val m = marshaller complete { val promise = Promise[T]() diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/RangeDirectives.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/RangeDirectives.scala index 4ea02314ba..a8a3fe40f8 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/RangeDirectives.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/RangeDirectives.scala @@ -36,7 +36,6 @@ trait RangeDirectives { */ def withRangeSupport: Directive0 = extractRequestContext.flatMap { ctx ⇒ - import ctx.materializer val settings = ctx.settings implicit val log = ctx.log import settings.{ rangeCountLimit, rangeCoalescingThreshold } diff --git a/akka-http/src/main/scala/akka/http/scaladsl/unmarshalling/MultipartUnmarshallers.scala b/akka-http/src/main/scala/akka/http/scaladsl/unmarshalling/MultipartUnmarshallers.scala index 845935713d..f1b0623642 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/unmarshalling/MultipartUnmarshallers.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/unmarshalling/MultipartUnmarshallers.scala @@ -4,7 +4,6 @@ package akka.http.scaladsl.unmarshalling -import akka.actor.ActorSystem import akka.http.scaladsl.settings.ParserSettings import scala.collection.immutable @@ -15,7 +14,6 @@ import akka.stream.{ActorMaterializer, OverflowStrategy} import akka.stream.impl.fusing.IteratorInterpreter import akka.stream.scaladsl._ import akka.http.impl.engine.parsing.BodyPartParser -import akka.http.impl.util._ import akka.http.scaladsl.model._ import akka.http.scaladsl.util.FastFuture import MediaRanges._ diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Conductor.scala b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Conductor.scala index 0111752fd2..7aa6c66ef7 100644 --- a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Conductor.scala +++ b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Conductor.scala @@ -4,11 +4,10 @@ package akka.remote.testconductor import language.postfixOps -import akka.actor.{ Actor, ActorRef, ActorSystem, LoggingFSM, Props, NoSerializationVerificationNeeded } +import akka.actor.{ Actor, ActorRef, LoggingFSM, Props, NoSerializationVerificationNeeded } import RemoteConnection.getAddrString import TestConductorProtocol._ import org.jboss.netty.channel.{ Channel, SimpleChannelUpstreamHandler, ChannelHandlerContext, ChannelStateEvent, MessageEvent } -import com.typesafe.config.ConfigFactory import scala.concurrent.duration._ import akka.pattern.ask import scala.concurrent.Await @@ -17,9 +16,8 @@ import scala.util.control.NoStackTrace import akka.event.LoggingReceive import java.net.InetSocketAddress import scala.concurrent.Future -import akka.actor.{ OneForOneStrategy, SupervisorStrategy, Status, Address, PoisonPill } +import akka.actor.{ OneForOneStrategy, SupervisorStrategy, Status, Address } import java.util.concurrent.ConcurrentHashMap -import java.util.concurrent.TimeUnit.MILLISECONDS import akka.util.{ Timeout } import scala.reflect.classTag import akka.ConfigurationException @@ -302,7 +300,6 @@ private[akka] object ServerFSM { */ private[akka] class ServerFSM(val controller: ActorRef, val channel: Channel) extends Actor with LoggingFSM[ServerFSM.State, Option[ActorRef]] { import ServerFSM._ - import akka.actor.FSM._ import Controller._ var roleName: RoleName = null @@ -525,9 +522,7 @@ private[akka] object BarrierCoordinator { */ private[akka] class BarrierCoordinator extends Actor with LoggingFSM[BarrierCoordinator.State, BarrierCoordinator.Data] { import BarrierCoordinator._ - import akka.actor.FSM._ import Controller._ - import akka.util.{ Timeout ⇒ auTimeout } // this shall be set to true if all subsequent barriers shall fail var failed = false diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/DataTypes.scala b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/DataTypes.scala index ab9a109dc2..94a046b13c 100644 --- a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/DataTypes.scala +++ b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/DataTypes.scala @@ -9,7 +9,6 @@ import org.jboss.netty.handler.codec.oneone.OneToOneEncoder import org.jboss.netty.channel.ChannelHandlerContext import org.jboss.netty.channel.Channel import akka.remote.testconductor.{ TestConductorProtocol ⇒ TCP } -import akka.protobuf.Message import akka.actor.Address import org.jboss.netty.handler.codec.oneone.OneToOneDecoder import scala.concurrent.duration._ diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Extension.scala b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Extension.scala index b888cd8a70..7beee67c92 100644 --- a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Extension.scala +++ b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Extension.scala @@ -3,12 +3,9 @@ */ package akka.remote.testconductor -import akka.actor.{ Extension, ExtensionId, ExtensionIdProvider, ExtendedActorSystem, ActorContext, ActorRef, Address, ActorSystem, Props } +import akka.actor.{ Extension, ExtensionId, ExtensionIdProvider, ExtendedActorSystem, ActorContext, ActorSystem } import akka.remote.RemoteActorRefProvider import akka.util.Timeout -import java.util.concurrent.TimeUnit.MILLISECONDS -import java.util.concurrent.ConcurrentHashMap -import scala.concurrent.duration.Duration import com.typesafe.config.Config import akka.dispatch.ThreadPoolConfig diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Player.scala b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Player.scala index 34fc56ee01..d698c673bc 100644 --- a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Player.scala +++ b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Player.scala @@ -3,8 +3,6 @@ */ package akka.remote.testconductor -import language.postfixOps - import java.util.concurrent.TimeoutException import akka.actor._ import akka.remote.testconductor.RemoteConnection.getAddrString @@ -15,7 +13,7 @@ import scala.util.control.NoStackTrace import scala.reflect.classTag import akka.util.Timeout import org.jboss.netty.channel.{ Channel, SimpleChannelUpstreamHandler, ChannelHandlerContext, ChannelStateEvent, MessageEvent, WriteCompletionEvent, ExceptionEvent } -import akka.pattern.{ ask, pipe, AskTimeoutException } +import akka.pattern.{ ask, AskTimeoutException } import akka.event.{ LoggingAdapter, Logging } import java.net.{ InetSocketAddress, ConnectException } import akka.remote.transport.ThrottlerTransportAdapter.{ SetThrottle, TokenBucket, Blackhole, Unthrottled } @@ -223,7 +221,6 @@ private[akka] class ClientFSM(name: RoleName, controllerAddr: InetSocketAddress) } stay using d.copy(runningOp = None) case t: ThrottleMsg ⇒ - import settings.QueryTimeout import context.dispatcher // FIXME is this the right EC for the future below? val mode = if (t.rateMBit < 0.0f) Unthrottled else if (t.rateMBit == 0.0f) Blackhole @@ -240,8 +237,6 @@ private[akka] class ClientFSM(name: RoleName, controllerAddr: InetSocketAddress) } stay case d: DisconnectMsg ⇒ - import settings.QueryTimeout - import context.dispatcher // FIXME is this the right EC for the future below? // FIXME: Currently ignoring, needs support from Remoting stay case TerminateMsg(Left(false)) ⇒ diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/RemoteConnection.scala b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/RemoteConnection.scala index 65759929b2..519eca2a71 100644 --- a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/RemoteConnection.scala +++ b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/RemoteConnection.scala @@ -3,12 +3,10 @@ */ package akka.remote.testconductor -import org.jboss.netty.channel.{ Channel, ChannelPipeline, ChannelPipelineFactory, ChannelUpstreamHandler, SimpleChannelUpstreamHandler, DefaultChannelPipeline } +import org.jboss.netty.channel.{ Channel, ChannelPipeline, ChannelPipelineFactory, ChannelUpstreamHandler, DefaultChannelPipeline } import org.jboss.netty.channel.socket.nio.{ NioClientSocketChannelFactory, NioServerSocketChannelFactory } import org.jboss.netty.bootstrap.{ ClientBootstrap, ServerBootstrap } import org.jboss.netty.handler.codec.frame.{ LengthFieldBasedFrameDecoder, LengthFieldPrepender } -import org.jboss.netty.handler.codec.compression.{ ZlibDecoder, ZlibEncoder } -import org.jboss.netty.handler.timeout.{ ReadTimeoutHandler, ReadTimeoutException } import java.net.InetSocketAddress import java.util.concurrent.Executors import akka.event.Logging diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala b/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala index 854081c820..aae55a1db7 100644 --- a/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala +++ b/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala @@ -4,9 +4,7 @@ package akka.remote.testkit import language.implicitConversions -import language.postfixOps import java.net.{ InetAddress, InetSocketAddress } -import java.util.concurrent.TimeoutException import com.typesafe.config.{ ConfigObject, ConfigFactory, Config } import scala.concurrent.{ Await, Awaitable } import scala.util.control.NonFatal @@ -14,7 +12,6 @@ import scala.collection.immutable import akka.actor._ import akka.util.Timeout import akka.remote.testconductor.{ TestConductorExt, TestConductor, RoleName } -import akka.remote.RemoteActorRefProvider import akka.testkit._ import akka.testkit.TestEvent._ import scala.concurrent.duration._ diff --git a/akka-osgi/src/main/scala/akka/osgi/BundleDelegatingClassLoader.scala b/akka-osgi/src/main/scala/akka/osgi/BundleDelegatingClassLoader.scala index 005dab500b..1925396537 100644 --- a/akka-osgi/src/main/scala/akka/osgi/BundleDelegatingClassLoader.scala +++ b/akka-osgi/src/main/scala/akka/osgi/BundleDelegatingClassLoader.scala @@ -8,7 +8,6 @@ import java.net.URL import java.util.Enumeration import org.osgi.framework.{ BundleContext, Bundle } import scala.util.Try -import scala.io.Source import org.osgi.framework.wiring.{ BundleRevision, BundleWire, BundleWiring } import scala.collection.JavaConverters._ import scala.util.Success diff --git a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala b/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala index 0c65396028..6d75c41f91 100644 --- a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala +++ b/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala @@ -6,7 +6,6 @@ package akka.osgi import akka.actor.ActorSystem import com.typesafe.config.{ ConfigFactory, Config } import org.osgi.framework.BundleContext -import java.io.File /** * Factory class to create ActorSystem implementations in an OSGi environment. This mainly involves dealing with diff --git a/akka-parsing/src/main/scala/akka/parboiled2/ErrorFormatter.scala b/akka-parsing/src/main/scala/akka/parboiled2/ErrorFormatter.scala index 33ae7284e1..5b454c701c 100644 --- a/akka-parsing/src/main/scala/akka/parboiled2/ErrorFormatter.scala +++ b/akka-parsing/src/main/scala/akka/parboiled2/ErrorFormatter.scala @@ -19,8 +19,6 @@ package akka.parboiled2 import scala.annotation.tailrec import java.lang.{ StringBuilder ⇒ JStringBuilder } -import scala.collection.immutable.VectorBuilder - /** * Abstraction for error formatting logic. * Instantiate with a custom configuration or override with custom logic. @@ -274,4 +272,4 @@ class ErrorFormatter(showExpected: Boolean = true, case SemanticPredicate ⇒ "test" } } -} \ No newline at end of file +} diff --git a/akka-parsing/src/main/scala/akka/shapeless/hlists.scala b/akka-parsing/src/main/scala/akka/shapeless/hlists.scala index 85af40f2a7..e14c8be049 100644 --- a/akka-parsing/src/main/scala/akka/shapeless/hlists.scala +++ b/akka-parsing/src/main/scala/akka/shapeless/hlists.scala @@ -16,7 +16,6 @@ package akka.shapeless -import scala.annotation.tailrec /** * `HList` ADT base trait. diff --git a/akka-parsing/src/main/scala/akka/shapeless/ops/hlists.scala b/akka-parsing/src/main/scala/akka/shapeless/ops/hlists.scala index e872826edc..6f2b677348 100644 --- a/akka-parsing/src/main/scala/akka/shapeless/ops/hlists.scala +++ b/akka-parsing/src/main/scala/akka/shapeless/ops/hlists.scala @@ -17,7 +17,6 @@ package akka.shapeless package ops -import scala.annotation.tailrec object hlist { /** diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/AllPersistenceIdsPublisher.scala b/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/AllPersistenceIdsPublisher.scala index 57c51e8fc1..055ee03230 100644 --- a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/AllPersistenceIdsPublisher.scala +++ b/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/AllPersistenceIdsPublisher.scala @@ -28,7 +28,6 @@ private[akka] object AllPersistenceIdsPublisher { */ private[akka] class AllPersistenceIdsPublisher(liveQuery: Boolean, maxBufSize: Int, writeJournalPluginId: String) extends ActorPublisher[String] with DeliveryBuffer[String] with ActorLogging { - import AllPersistenceIdsPublisher._ val journal: ActorRef = Persistence(context.system).journalFor(writeJournalPluginId) diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/javadsl/LeveldbReadJournal.scala b/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/javadsl/LeveldbReadJournal.scala index c9fb175454..60027385f4 100644 --- a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/javadsl/LeveldbReadJournal.scala +++ b/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/javadsl/LeveldbReadJournal.scala @@ -5,8 +5,6 @@ package akka.persistence.query.journal.leveldb.javadsl import akka.NotUsed -import scala.concurrent.duration._ - import akka.persistence.query.EventEnvelope import akka.persistence.query.javadsl._ import akka.stream.javadsl.Source diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/DummyReadJournal.scala b/akka-persistence-query/src/test/scala/akka/persistence/query/DummyReadJournal.scala index 87e52d3d0f..ddcb824d5b 100644 --- a/akka-persistence-query/src/test/scala/akka/persistence/query/DummyReadJournal.scala +++ b/akka-persistence-query/src/test/scala/akka/persistence/query/DummyReadJournal.scala @@ -7,7 +7,6 @@ package akka.persistence.query import akka.NotUsed import akka.stream.scaladsl.Source import com.typesafe.config.{ Config, ConfigFactory } -import scala.runtime.BoxedUnit /** * Use for tests only! diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/AllPersistenceIdsSpec.scala b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/AllPersistenceIdsSpec.scala index 5e30fa836f..937043f68c 100644 --- a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/AllPersistenceIdsSpec.scala +++ b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/AllPersistenceIdsSpec.scala @@ -24,7 +24,6 @@ object AllPersistenceIdsSpec { class AllPersistenceIdsSpec extends AkkaSpec(AllPersistenceIdsSpec.config) with Cleanup with ImplicitSender { - import AllPersistenceIdsSpec._ implicit val mat = ActorMaterializer()(system) diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdSpec.scala b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdSpec.scala index f29131a7a5..c323118942 100644 --- a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdSpec.scala +++ b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdSpec.scala @@ -26,7 +26,6 @@ object EventsByPersistenceIdSpec { class EventsByPersistenceIdSpec extends AkkaSpec(EventsByPersistenceIdSpec.config) with Cleanup with ImplicitSender { - import EventsByPersistenceIdSpec._ implicit val mat = ActorMaterializer()(system) diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByTagSpec.scala b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByTagSpec.scala index 09c191c601..1272baba50 100644 --- a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByTagSpec.scala +++ b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByTagSpec.scala @@ -50,7 +50,6 @@ class ColorTagger extends WriteEventAdapter { class EventsByTagSpec extends AkkaSpec(EventsByTagSpec.config) with Cleanup with ImplicitSender { - import EventsByTagSpec._ implicit val mat = ActorMaterializer()(system) diff --git a/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/SharedLeveldbJournalSpec.scala b/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/SharedLeveldbJournalSpec.scala index 70894701c9..308e4a067b 100644 --- a/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/SharedLeveldbJournalSpec.scala +++ b/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/SharedLeveldbJournalSpec.scala @@ -4,9 +4,6 @@ package akka.persistence.journal.leveldb -import scala.concurrent.duration._ -import com.typesafe.config.ConfigFactory - import akka.actor._ import akka.persistence._ import akka.testkit.{ TestProbe, AkkaSpec } diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/japi/snapshot/JavaSnapshotStoreSpec.scala b/akka-persistence-tck/src/main/scala/akka/persistence/japi/snapshot/JavaSnapshotStoreSpec.scala index c4cbe27b57..03ec1c5eed 100644 --- a/akka-persistence-tck/src/main/scala/akka/persistence/japi/snapshot/JavaSnapshotStoreSpec.scala +++ b/akka-persistence-tck/src/main/scala/akka/persistence/japi/snapshot/JavaSnapshotStoreSpec.scala @@ -3,8 +3,7 @@ */ package akka.persistence.japi.snapshot -import akka.persistence.CapabilityFlag -import akka.persistence.snapshot.{ SnapshotStore, SnapshotStoreSpec } +import akka.persistence.snapshot.{ SnapshotStoreSpec } import com.typesafe.config.Config import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner @@ -21,4 +20,4 @@ import org.scalatest.junit.JUnitRunner * @see [[akka.persistence.snapshot.SnapshotStoreSpec]] */ @RunWith(classOf[JUnitRunner]) -class JavaSnapshotStoreSpec(config: Config) extends SnapshotStoreSpec(config) \ No newline at end of file +class JavaSnapshotStoreSpec(config: Config) extends SnapshotStoreSpec(config) diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/journal/JournalPerfSpec.scala b/akka-persistence-tck/src/main/scala/akka/persistence/journal/JournalPerfSpec.scala index 56d3e35bce..8b12e1d433 100644 --- a/akka-persistence-tck/src/main/scala/akka/persistence/journal/JournalPerfSpec.scala +++ b/akka-persistence-tck/src/main/scala/akka/persistence/journal/JournalPerfSpec.scala @@ -5,7 +5,7 @@ package akka.persistence.journal import akka.actor.{ ActorLogging, ActorRef, Props } import akka.persistence.journal.JournalPerfSpec.{ BenchActor, Cmd, ResetCounter } -import akka.persistence.{ PersistentActor, PluginSpec } +import akka.persistence.{ PersistentActor } import akka.testkit.TestProbe import scala.collection.immutable import scala.concurrent.duration._ diff --git a/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalJavaSpec.scala b/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalJavaSpec.scala index f647080806..e788ab8eb5 100644 --- a/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalJavaSpec.scala +++ b/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalJavaSpec.scala @@ -1,7 +1,7 @@ package akka.persistence.journal.leveldb import akka.persistence.journal.JournalSpec -import akka.persistence.{ CapabilityFlag, PersistenceSpec, PluginCleanup } +import akka.persistence.{ PersistenceSpec, PluginCleanup } class LeveldbJournalJavaSpec extends JournalSpec( config = PersistenceSpec.config( diff --git a/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNativePerfSpec.scala b/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNativePerfSpec.scala index 4f74629a05..51b194282c 100644 --- a/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNativePerfSpec.scala +++ b/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNativePerfSpec.scala @@ -3,8 +3,8 @@ */ package akka.persistence.journal.leveldb -import akka.persistence.journal.{ JournalPerfSpec, JournalSpec } -import akka.persistence.{ CapabilityFlag, PersistenceSpec, PluginCleanup } +import akka.persistence.journal.{ JournalPerfSpec } +import akka.persistence.{ PersistenceSpec, PluginCleanup } import org.scalatest.DoNotDiscover @DoNotDiscover // because only checking that compilation is OK with JournalPerfSpec diff --git a/akka-persistence/src/main/scala/akka/persistence/AtLeastOnceDelivery.scala b/akka-persistence/src/main/scala/akka/persistence/AtLeastOnceDelivery.scala index cac6ff35a2..1ac4c8e5bf 100644 --- a/akka-persistence/src/main/scala/akka/persistence/AtLeastOnceDelivery.scala +++ b/akka-persistence/src/main/scala/akka/persistence/AtLeastOnceDelivery.scala @@ -3,11 +3,10 @@ */ package akka.persistence -import scala.annotation.tailrec import scala.collection.breakOut import scala.collection.immutable import scala.concurrent.duration.FiniteDuration -import akka.actor.{ ActorSelection, Actor, ActorPath, NotInfluenceReceiveTimeout } +import akka.actor.{ ActorSelection, ActorPath, NotInfluenceReceiveTimeout } import akka.persistence.serialization.Message import akka.actor.Cancellable diff --git a/akka-persistence/src/main/scala/akka/persistence/Persistent.scala b/akka-persistence/src/main/scala/akka/persistence/Persistent.scala index 332c2ffbf1..2e1ed023b1 100644 --- a/akka-persistence/src/main/scala/akka/persistence/Persistent.scala +++ b/akka-persistence/src/main/scala/akka/persistence/Persistent.scala @@ -4,9 +4,6 @@ package akka.persistence -import java.lang.{ Iterable ⇒ JIterable } -import java.util.{ List ⇒ JList } - import akka.actor.{ ActorRef, NoSerializationVerificationNeeded } import akka.persistence.serialization.Message diff --git a/akka-persistence/src/main/scala/akka/persistence/PersistentView.scala b/akka-persistence/src/main/scala/akka/persistence/PersistentView.scala index 6ce4ac7f16..13f673718a 100644 --- a/akka-persistence/src/main/scala/akka/persistence/PersistentView.scala +++ b/akka-persistence/src/main/scala/akka/persistence/PersistentView.scala @@ -12,7 +12,6 @@ import akka.actor.Cancellable import akka.actor.Stash import akka.actor.StashFactory import akka.actor.UntypedActor -import akka.dispatch.Envelope import akka.actor.ActorLogging /** diff --git a/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSM.scala b/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSM.scala index 02384b5b18..d9df80b752 100644 --- a/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSM.scala +++ b/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSM.scala @@ -5,7 +5,7 @@ package akka.persistence.fsm import akka.actor._ -import akka.persistence.fsm.PersistentFSM.{ State, FSMState } +import akka.persistence.fsm.PersistentFSM.{ FSMState } import akka.persistence.serialization.Message import akka.persistence.{ PersistentActor, RecoveryCompleted } diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteProxy.scala b/akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteProxy.scala index 8f2aff2565..d2eab39588 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteProxy.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteProxy.scala @@ -14,7 +14,6 @@ import scala.util.Try import scala.collection.immutable import scala.concurrent._ import scala.concurrent.duration.Duration -import scala.language.postfixOps /** * INTERNAL API. diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/inmem/InmemJournal.scala b/akka-persistence/src/main/scala/akka/persistence/journal/inmem/InmemJournal.scala index 8374c51e81..771c860141 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/inmem/InmemJournal.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/inmem/InmemJournal.scala @@ -6,7 +6,6 @@ package akka.persistence.journal.inmem import scala.collection.immutable import scala.concurrent.Future -import scala.concurrent.duration._ import scala.util.Try import akka.persistence.journal.AsyncWriteJournal import akka.persistence.PersistentRepr diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/japi/AsyncWriteJournal.scala b/akka-persistence/src/main/scala/akka/persistence/journal/japi/AsyncWriteJournal.scala index 615d7fce01..4e404b5781 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/japi/AsyncWriteJournal.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/japi/AsyncWriteJournal.scala @@ -10,7 +10,6 @@ import akka.persistence._ import akka.persistence.journal.{ AsyncWriteJournal ⇒ SAsyncWriteJournal } import scala.concurrent.Future import scala.util.Try -import scala.util.Success import scala.util.Failure /** diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbJournal.scala b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbJournal.scala index b478e0762c..01422af369 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbJournal.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbJournal.scala @@ -3,8 +3,6 @@ */ package akka.persistence.journal.leveldb -import scala.concurrent.duration._ -import scala.language.postfixOps import akka.actor._ import akka.persistence.Persistence import akka.persistence.journal._ diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbStore.scala b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbStore.scala index 57b702ac0d..c51a6c8463 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbStore.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbStore.scala @@ -9,14 +9,13 @@ import java.io.File import scala.collection.mutable import akka.actor._ import akka.persistence._ -import akka.persistence.journal.{ WriteJournalBase, AsyncWriteTarget } +import akka.persistence.journal.{ WriteJournalBase } import akka.serialization.SerializationExtension import org.iq80.leveldb._ import scala.collection.immutable import scala.util._ import scala.concurrent.Future import scala.util.control.NonFatal -import akka.persistence.journal.AsyncWriteJournal import akka.persistence.journal.Tagged /** diff --git a/akka-persistence/src/main/scala/akka/persistence/serialization/SnapshotSerializer.scala b/akka-persistence/src/main/scala/akka/persistence/serialization/SnapshotSerializer.scala index ebdf835639..44d307e7bb 100644 --- a/akka-persistence/src/main/scala/akka/persistence/serialization/SnapshotSerializer.scala +++ b/akka-persistence/src/main/scala/akka/persistence/serialization/SnapshotSerializer.scala @@ -9,8 +9,6 @@ import java.io._ import akka.actor._ import akka.serialization._ import akka.util.ByteString.UTF_8 -import scala.util.Success -import scala.util.Failure /** * Wrapper for snapshot `data`. Snapshot `data` are the actual snapshot objects captured by diff --git a/akka-persistence/src/test/scala/akka/persistence/EndToEndEventAdapterSpec.scala b/akka-persistence/src/test/scala/akka/persistence/EndToEndEventAdapterSpec.scala index 83e1b5a4f4..64d57eeb5e 100644 --- a/akka-persistence/src/test/scala/akka/persistence/EndToEndEventAdapterSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/EndToEndEventAdapterSpec.scala @@ -8,7 +8,7 @@ import java.io.File import akka.actor._ import akka.persistence.EndToEndEventAdapterSpec.NewA import akka.persistence.journal.{ EventSeq, EventAdapter } -import akka.testkit.{ ImplicitSender, WatchedByCoroner, AkkaSpec, TestProbe, EventFilter } +import akka.testkit.{ TestProbe, EventFilter } import com.typesafe.config.{ Config, ConfigFactory } import org.apache.commons.io.FileUtils import org.scalatest.{ WordSpecLike, Matchers, BeforeAndAfterAll } diff --git a/akka-persistence/src/test/scala/akka/persistence/OptionalSnapshotStoreSpec.scala b/akka-persistence/src/test/scala/akka/persistence/OptionalSnapshotStoreSpec.scala index 794f9e60f6..7ab95c18db 100644 --- a/akka-persistence/src/test/scala/akka/persistence/OptionalSnapshotStoreSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/OptionalSnapshotStoreSpec.scala @@ -9,8 +9,6 @@ import akka.event.Logging.Warning import akka.testkit.{ EventFilter, ImplicitSender, TestEvent } import com.typesafe.config.ConfigFactory -import scala.language.postfixOps - object OptionalSnapshotStoreSpec { class AnyPersistentActor(name: String) extends PersistentActor { diff --git a/akka-persistence/src/test/scala/akka/persistence/PerformanceSpec.scala b/akka-persistence/src/test/scala/akka/persistence/PerformanceSpec.scala index c826bf1bbc..43756e8139 100644 --- a/akka-persistence/src/test/scala/akka/persistence/PerformanceSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/PerformanceSpec.scala @@ -4,7 +4,6 @@ package akka.persistence import scala.concurrent.duration._ -import scala.language.postfixOps import com.typesafe.config.ConfigFactory diff --git a/akka-persistence/src/test/scala/akka/persistence/PersistentActorDeleteFailureSpec.scala b/akka-persistence/src/test/scala/akka/persistence/PersistentActorDeleteFailureSpec.scala index bd3dab8070..64ffb26e0e 100644 --- a/akka-persistence/src/test/scala/akka/persistence/PersistentActorDeleteFailureSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/PersistentActorDeleteFailureSpec.scala @@ -12,7 +12,6 @@ import akka.testkit.{ EventFilter, ImplicitSender, TestEvent } import scala.concurrent.Future import scala.concurrent.duration._ -import scala.language.postfixOps import scala.util.control.NoStackTrace object PersistentActorDeleteFailureSpec { diff --git a/akka-persistence/src/test/scala/akka/persistence/PersistentActorFailureSpec.scala b/akka-persistence/src/test/scala/akka/persistence/PersistentActorFailureSpec.scala index 78eb9f258f..39d03e1bd9 100644 --- a/akka-persistence/src/test/scala/akka/persistence/PersistentActorFailureSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/PersistentActorFailureSpec.scala @@ -5,13 +5,9 @@ package akka.persistence import akka.actor.{ OneForOneStrategy, _ } -import akka.persistence.journal.AsyncWriteTarget.{ ReplayFailure, ReplayMessages, ReplaySuccess, WriteMessages } import akka.persistence.journal.AsyncWriteJournal import akka.testkit.{ EventFilter, ImplicitSender, TestEvent } -import akka.util.Timeout import scala.collection.immutable -import scala.concurrent.duration._ -import scala.language.postfixOps import scala.util.control.NoStackTrace import scala.util.{ Failure, Try } import akka.persistence.journal.inmem.InmemJournal diff --git a/akka-persistence/src/test/scala/akka/persistence/SnapshotSerializationSpec.scala b/akka-persistence/src/test/scala/akka/persistence/SnapshotSerializationSpec.scala index 292732fc12..cee780437e 100644 --- a/akka-persistence/src/test/scala/akka/persistence/SnapshotSerializationSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/SnapshotSerializationSpec.scala @@ -6,7 +6,7 @@ package akka.persistence import akka.actor.{ Props, ActorRef } import akka.serialization.Serializer -import akka.testkit.{ ImplicitSender, AkkaSpec } +import akka.testkit.{ ImplicitSender } import java.io._ object SnapshotSerializationSpec { diff --git a/akka-persistence/src/test/scala/akka/persistence/journal/ReplayFilterSpec.scala b/akka-persistence/src/test/scala/akka/persistence/journal/ReplayFilterSpec.scala index 2914dc156c..e2eb478014 100644 --- a/akka-persistence/src/test/scala/akka/persistence/journal/ReplayFilterSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/journal/ReplayFilterSpec.scala @@ -3,7 +3,6 @@ */ package akka.persistence.journal -import scala.concurrent.duration._ import akka.actor._ import akka.testkit._ import akka.persistence.JournalProtocol diff --git a/akka-persistence/src/test/scala/akka/persistence/journal/SteppingInmemJournal.scala b/akka-persistence/src/test/scala/akka/persistence/journal/SteppingInmemJournal.scala index 6520695654..6b2f70d299 100644 --- a/akka-persistence/src/test/scala/akka/persistence/journal/SteppingInmemJournal.scala +++ b/akka-persistence/src/test/scala/akka/persistence/journal/SteppingInmemJournal.scala @@ -15,7 +15,6 @@ import scala.collection.immutable.Seq import scala.concurrent.duration._ import scala.concurrent.{ Await, Future, Promise } import scala.util.Try -import scala.util.Success object SteppingInmemJournal { diff --git a/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala b/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala index 41f96be084..de2b5d36f3 100644 --- a/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala +++ b/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala @@ -8,9 +8,6 @@ import language.postfixOps import akka.actor._ import akka.testkit.{ AkkaSpec, ImplicitSender, EventFilter, TestProbe, TimingTest } import scala.concurrent.duration._ -import akka.event.Logging -import akka.util.Timeout -import org.scalatest.BeforeAndAfterEach import java.net.{ InetSocketAddress, InetAddress } object BarrierSpec { diff --git a/akka-remote/src/main/scala/akka/remote/Endpoint.scala b/akka-remote/src/main/scala/akka/remote/Endpoint.scala index 64468fa4bc..58510e17ea 100644 --- a/akka-remote/src/main/scala/akka/remote/Endpoint.scala +++ b/akka-remote/src/main/scala/akka/remote/Endpoint.scala @@ -23,11 +23,10 @@ import akka.{ OnlyCauseStackTrace, AkkaException } import java.io.NotSerializableException import java.util.concurrent.{ TimeUnit, TimeoutException, ConcurrentHashMap } import scala.annotation.tailrec -import scala.concurrent.duration.{ Duration, Deadline } +import scala.concurrent.duration.{ Deadline } import scala.util.control.NonFatal import java.util.concurrent.locks.LockSupport import scala.concurrent.Future -import scala.concurrent.blocking /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala b/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala index d375477d86..2bff7f13c7 100644 --- a/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala +++ b/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala @@ -5,7 +5,6 @@ package akka.remote import akka.remote.FailureDetector.Clock import java.util.concurrent.atomic.AtomicReference -import java.util.concurrent.TimeUnit.MILLISECONDS import scala.annotation.tailrec import scala.concurrent.duration.Duration import scala.concurrent.duration.FiniteDuration diff --git a/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala b/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala index 4904fb2092..b1b744fec1 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala @@ -6,13 +6,12 @@ package akka.remote import scala.annotation.tailrec import scala.util.control.NonFatal -import akka.actor.{ VirtualPathContainer, Terminated, Deploy, Props, Nobody, LocalActorRef, InternalActorRef, Address, ActorSystemImpl, ActorRef, ActorPathExtractor, ActorPath, Actor, AddressTerminated } +import akka.actor.{ VirtualPathContainer, Deploy, Props, Nobody, InternalActorRef, ActorSystemImpl, ActorRef, ActorPathExtractor, ActorPath, Actor, AddressTerminated } import akka.event.LoggingAdapter import akka.dispatch.sysmsg.{ DeathWatchNotification, SystemMessage, Watch } import akka.actor.ActorRefWithCell import akka.actor.ActorRefScope import akka.util.Switch -import akka.actor.RootActorPath import akka.actor.ActorSelectionMessage import akka.actor.SelectParent import akka.actor.SelectChildName diff --git a/akka-remote/src/main/scala/akka/remote/RemoteDeployer.scala b/akka-remote/src/main/scala/akka/remote/RemoteDeployer.scala index acf05ae27e..0524359658 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteDeployer.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteDeployer.scala @@ -22,7 +22,6 @@ final case class RemoteScope(node: Address) extends Scope { */ private[akka] class RemoteDeployer(_settings: ActorSystem.Settings, _pm: DynamicAccess) extends Deployer(_settings, _pm) { override def parseConfig(path: String, config: Config): Option[Deploy] = { - import scala.collection.JavaConverters._ super.parseConfig(path, config) match { case d @ Some(deploy) ⇒ diff --git a/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala b/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala index 8b9f32dda0..f6138bb5fb 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala @@ -5,7 +5,6 @@ package akka.remote import com.typesafe.config.Config import scala.concurrent.duration._ -import java.util.concurrent.TimeUnit.MILLISECONDS import akka.util.Timeout import scala.collection.immutable import akka.util.Helpers.ConfigOps diff --git a/akka-remote/src/main/scala/akka/remote/RemoteTransport.scala b/akka-remote/src/main/scala/akka/remote/RemoteTransport.scala index f17cb22a34..71ae62170e 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteTransport.scala @@ -6,7 +6,7 @@ package akka.remote import akka.AkkaException import akka.actor._ -import akka.event.{ Logging, LoggingAdapter } +import akka.event.{ LoggingAdapter } import scala.collection.immutable import scala.concurrent.Future import scala.util.control.NoStackTrace diff --git a/akka-remote/src/main/scala/akka/remote/security/provider/AkkaProvider.scala b/akka-remote/src/main/scala/akka/remote/security/provider/AkkaProvider.scala index 8786d09d47..98f520e9b9 100644 --- a/akka-remote/src/main/scala/akka/remote/security/provider/AkkaProvider.scala +++ b/akka-remote/src/main/scala/akka/remote/security/provider/AkkaProvider.scala @@ -3,7 +3,7 @@ */ package akka.remote.security.provider -import java.security.{ PrivilegedAction, AccessController, Provider, Security } +import java.security.{ PrivilegedAction, AccessController, Provider } /** * A provider that for AES128CounterRNGFast, a cryptographically secure random number generator through SecureRandom diff --git a/akka-remote/src/main/scala/akka/remote/security/provider/InternetSeedGenerator.scala b/akka-remote/src/main/scala/akka/remote/security/provider/InternetSeedGenerator.scala index 8c26fa27b9..0ad678cb43 100644 --- a/akka-remote/src/main/scala/akka/remote/security/provider/InternetSeedGenerator.scala +++ b/akka-remote/src/main/scala/akka/remote/security/provider/InternetSeedGenerator.scala @@ -15,7 +15,7 @@ // ============================================================================ package akka.remote.security.provider -import org.uncommons.maths.random.{ SeedGenerator, SeedException, SecureRandomSeedGenerator, RandomDotOrgSeedGenerator, DevRandomSeedGenerator } +import org.uncommons.maths.random.{ SeedGenerator, SeedException, SecureRandomSeedGenerator, RandomDotOrgSeedGenerator } import scala.collection.immutable /** diff --git a/akka-remote/src/main/scala/akka/remote/serialization/DaemonMsgCreateSerializer.scala b/akka-remote/src/main/scala/akka/remote/serialization/DaemonMsgCreateSerializer.scala index 1cd1589a40..6a5e83991e 100644 --- a/akka-remote/src/main/scala/akka/remote/serialization/DaemonMsgCreateSerializer.scala +++ b/akka-remote/src/main/scala/akka/remote/serialization/DaemonMsgCreateSerializer.scala @@ -5,10 +5,9 @@ package akka.remote.serialization import akka.serialization.{ BaseSerializer, SerializationExtension } -import java.io.Serializable import akka.protobuf.ByteString import com.typesafe.config.{ Config, ConfigFactory } -import akka.actor.{ Actor, ActorRef, Deploy, ExtendedActorSystem, NoScopeGiven, Props, Scope } +import akka.actor.{ Deploy, ExtendedActorSystem, NoScopeGiven, Props, Scope } import akka.remote.DaemonMsgCreate import akka.remote.WireFormats.{ DaemonMsgCreateData, DeployData, PropsData } import akka.routing.{ NoRouter, RouterConfig } diff --git a/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala index 6b5fa6f2d5..187237e8da 100644 --- a/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala @@ -4,7 +4,6 @@ package akka.remote.transport import java.util.concurrent.TimeoutException -import akka.ConfigurationException import akka.actor.SupervisorStrategy.Stop import akka.actor._ import akka.pattern.pipe diff --git a/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala index 8aba6eebb6..6f367d1078 100644 --- a/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala +++ b/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala @@ -14,7 +14,6 @@ import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ThreadLocalRandom import scala.concurrent.{ Future, Promise } import scala.util.control.NoStackTrace -import scala.util.Try @SerialVersionUID(1L) final case class FailureInjectorException(msg: String) extends AkkaException(msg) with NoStackTrace diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala index 74889df96a..2df8334ff7 100644 --- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala @@ -12,7 +12,7 @@ import akka.remote.transport.netty.NettyTransportSettings.{ Udp, Tcp, Mode } import akka.remote.transport.{ AssociationHandle, Transport } import akka.{ OnlyCauseStackTrace, ConfigurationException } import com.typesafe.config.Config -import java.net.{ UnknownHostException, SocketAddress, InetAddress, InetSocketAddress, ConnectException } +import java.net.{ SocketAddress, InetAddress, InetSocketAddress} import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.{ ConcurrentHashMap, Executors, CancellationException } import org.jboss.netty.bootstrap.{ ConnectionlessBootstrap, Bootstrap, ClientBootstrap, ServerBootstrap } @@ -22,9 +22,9 @@ import org.jboss.netty.channel.group.{ DefaultChannelGroup, ChannelGroup, Channe import org.jboss.netty.channel.socket.nio.{ NioWorkerPool, NioDatagramChannelFactory, NioServerSocketChannelFactory, NioClientSocketChannelFactory } import org.jboss.netty.handler.codec.frame.{ LengthFieldBasedFrameDecoder, LengthFieldPrepender } import org.jboss.netty.handler.ssl.SslHandler -import scala.concurrent.duration.{ Duration, FiniteDuration, MILLISECONDS } +import scala.concurrent.duration.{ FiniteDuration} import scala.concurrent.{ ExecutionContext, Promise, Future, blocking } -import scala.util.{ Failure, Success, Try } +import scala.util.{ Try } import scala.util.control.{ NoStackTrace, NonFatal } import akka.util.Helpers.Requiring import akka.util.Helpers diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala index 593a78a545..787c754906 100644 --- a/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala +++ b/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala @@ -12,7 +12,6 @@ import java.net.InetSocketAddress import org.jboss.netty.buffer.{ ChannelBuffers, ChannelBuffer } import org.jboss.netty.channel._ import scala.concurrent.{ Future, Promise } -import scala.util.{ Success, Failure } /** * INTERNAL API diff --git a/akka-remote/src/test/scala/akka/remote/ActorsLeakSpec.scala b/akka-remote/src/test/scala/akka/remote/ActorsLeakSpec.scala index c4445801aa..ae75f3fa88 100644 --- a/akka-remote/src/test/scala/akka/remote/ActorsLeakSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/ActorsLeakSpec.scala @@ -7,9 +7,7 @@ import java.util.concurrent.TimeoutException import akka.actor._ import akka.actor.dungeon.ChildrenContainer -import akka.event.Logging -import akka.remote.transport.ThrottlerTransportAdapter.Direction.Both -import akka.remote.transport.ThrottlerTransportAdapter.{ ForceDisassociate, Blackhole, SetThrottle } +import akka.remote.transport.ThrottlerTransportAdapter.{ ForceDisassociate } import akka.testkit._ import akka.testkit.TestActors.EchoActor import com.typesafe.config.ConfigFactory diff --git a/akka-remote/src/test/scala/akka/remote/DeadlineFailureDetectorSpec.scala b/akka-remote/src/test/scala/akka/remote/DeadlineFailureDetectorSpec.scala index 90743f2b82..0966ef0b19 100644 --- a/akka-remote/src/test/scala/akka/remote/DeadlineFailureDetectorSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/DeadlineFailureDetectorSpec.scala @@ -5,7 +5,6 @@ package akka.remote import akka.testkit.AkkaSpec -import scala.collection.immutable.TreeMap import scala.concurrent.duration._ import akka.remote.FailureDetector.Clock diff --git a/akka-remote/src/test/scala/akka/remote/EndpointRegistrySpec.scala b/akka-remote/src/test/scala/akka/remote/EndpointRegistrySpec.scala index 5fc5e9df1e..f3434ccaa5 100644 --- a/akka-remote/src/test/scala/akka/remote/EndpointRegistrySpec.scala +++ b/akka-remote/src/test/scala/akka/remote/EndpointRegistrySpec.scala @@ -1,7 +1,7 @@ package akka.remote import akka.testkit.AkkaSpec -import akka.actor.{ Props, ActorRef, Address } +import akka.actor.{ Props, Address } import akka.remote.EndpointManager._ import scala.concurrent.duration._ diff --git a/akka-remote/src/test/scala/akka/remote/LogSourceSpec.scala b/akka-remote/src/test/scala/akka/remote/LogSourceSpec.scala index 521fd9012b..dcc8bad83e 100644 --- a/akka-remote/src/test/scala/akka/remote/LogSourceSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/LogSourceSpec.scala @@ -3,13 +3,11 @@ */ package akka.remote -import scala.concurrent.duration._ import akka.testkit.AkkaSpec import akka.actor.Actor import akka.actor.ActorLogging import akka.actor.Props import akka.event.Logging -import akka.testkit.ImplicitSender import akka.testkit.TestProbe import akka.actor.Deploy import akka.event.Logging.Info diff --git a/akka-remote/src/test/scala/akka/remote/NetworkFailureSpec.scala b/akka-remote/src/test/scala/akka/remote/NetworkFailureSpec.scala index 514e123af9..968898383f 100644 --- a/akka-remote/src/test/scala/akka/remote/NetworkFailureSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/NetworkFailureSpec.scala @@ -4,18 +4,13 @@ package akka.remote -import org.scalatest.{ BeforeAndAfterAll, BeforeAndAfterEach } - -import akka.actor.Actor import akka.testkit.AkkaSpec import akka.testkit.DefaultTimeout -import java.util.concurrent.{ TimeUnit, CountDownLatch } import java.util.concurrent.atomic.AtomicBoolean -import scala.concurrent.{ ExecutionContext, Future } +import scala.concurrent.{ Future } trait NetworkFailureSpec extends DefaultTimeout { self: AkkaSpec ⇒ - import Actor._ import scala.concurrent.duration.Duration import system.dispatcher diff --git a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala index 817c51096a..d6af8473e2 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala @@ -5,10 +5,9 @@ package akka.remote import language.postfixOps import akka.testkit.AkkaSpec -import akka.actor.ExtendedActorSystem import scala.concurrent.duration._ import akka.remote.transport.AkkaProtocolSettings -import akka.util.{ Timeout, Helpers } +import akka.util.{ Helpers } import akka.util.Helpers.ConfigOps import akka.remote.transport.netty.{ NettyTransportSettings, SSLSettings } diff --git a/akka-remote/src/test/scala/akka/remote/RemoteInitErrorSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteInitErrorSpec.scala index 291e4990ca..327064fa4e 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteInitErrorSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteInitErrorSpec.scala @@ -4,14 +4,10 @@ package akka.remote import akka.actor.ActorSystem -import akka.testkit.AkkaSpec -import akka.testkit.DefaultTimeout import com.typesafe.config.ConfigFactory import org.scalatest.FlatSpec import org.scalatest.Matchers -import org.scalatest.WordSpecLike import org.scalatest.concurrent.Eventually._ -import scala.annotation.tailrec import scala.collection.JavaConversions._ import scala.collection.mutable.Set import scala.concurrent.duration._ diff --git a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala index ab4957dc97..ff2076fead 100644 --- a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala @@ -6,7 +6,7 @@ package akka.remote import akka.actor._ import akka.event.AddressTerminatedTopic import akka.pattern.ask -import akka.remote.transport.AssociationHandle.{ HandleEventListener, InboundPayload, HandleEvent } +import akka.remote.transport.AssociationHandle.{ HandleEventListener, HandleEvent } import akka.remote.transport._ import akka.remote.transport.Transport.InvalidAssociationException import akka.testkit._ diff --git a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala index 715419ed8f..91b589c68b 100644 --- a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala @@ -3,20 +3,17 @@ */ package akka.remote -import language.postfixOps import akka.testkit._ import akka.actor._ import com.typesafe.config._ import scala.concurrent.Future import scala.reflect.classTag import akka.pattern.ask -import java.io.File -import java.security.{ NoSuchAlgorithmException, SecureRandom, PrivilegedAction, AccessController } -import javax.net.ssl.SSLException +import java.security.{ NoSuchAlgorithmException } import akka.util.Timeout import scala.concurrent.Await import scala.concurrent.duration._ -import akka.event.{ Logging, NoLogging, LoggingAdapter } +import akka.event.{ NoLogging } import akka.remote.transport.netty.{ SSLSettings, NettySSLSupport } import Configuration.{ CipherConfig, getCipherConfig } import org.uncommons.maths.random.RandomDotOrgSeedGenerator diff --git a/akka-remote/src/test/scala/akka/remote/Ticket1978ConfigSpec.scala b/akka-remote/src/test/scala/akka/remote/Ticket1978ConfigSpec.scala index 998eb52b0e..a449d2dad1 100644 --- a/akka-remote/src/test/scala/akka/remote/Ticket1978ConfigSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/Ticket1978ConfigSpec.scala @@ -1,10 +1,6 @@ package akka.remote import akka.testkit._ -import akka.actor._ -import com.typesafe.config._ -import scala.concurrent.duration._ -import java.util.ArrayList import akka.remote.transport.netty.SSLSettings @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) diff --git a/akka-remote/src/test/scala/akka/remote/serialization/MessageContainerSerializerSpec.scala b/akka-remote/src/test/scala/akka/remote/serialization/MessageContainerSerializerSpec.scala index 31c50c4c37..ac617c33d1 100644 --- a/akka-remote/src/test/scala/akka/remote/serialization/MessageContainerSerializerSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/serialization/MessageContainerSerializerSpec.scala @@ -5,13 +5,11 @@ package akka.remote.serialization import akka.serialization.SerializationExtension -import com.typesafe.config.ConfigFactory import akka.testkit.AkkaSpec import akka.actor.ActorSelectionMessage import akka.actor.SelectChildName import akka.actor.SelectParent import akka.actor.SelectChildPattern -import akka.util.Helpers @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class MessageContainerSerializerSpec extends AkkaSpec { diff --git a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala index daecb84094..55180e657d 100644 --- a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala @@ -1,19 +1,18 @@ package akka.remote.transport -import akka.actor.{ ExtendedActorSystem, Address, Props } +import akka.actor.{ Address } import akka.remote.transport.AkkaPduCodec.{ Disassociate, Associate, Heartbeat } import akka.remote.transport.AkkaProtocolSpec.TestFailureDetector import akka.remote.transport.AssociationHandle.{ DisassociateInfo, ActorHandleEventListener, Disassociated, InboundPayload } import akka.remote.transport.TestTransport._ import akka.remote.transport.Transport._ -import akka.remote.{ SeqNo, WireFormats, RemoteActorRefProvider, FailureDetector } +import akka.remote.{ WireFormats, FailureDetector } import akka.testkit.{ ImplicitSender, AkkaSpec } import akka.util.ByteString import akka.protobuf.{ ByteString ⇒ PByteString } import com.typesafe.config.ConfigFactory import scala.concurrent.duration._ import scala.concurrent.{ Await, Promise } -import akka.actor.Deploy import java.util.concurrent.TimeoutException object AkkaProtocolSpec { diff --git a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala index 8aad94bf07..e8deaa2a83 100644 --- a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala +++ b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala @@ -7,7 +7,7 @@ import akka.actor._ import scala.concurrent.duration._ import akka.testkit._ import akka.remote.{ RARP, EndpointException } -import akka.remote.transport.FailureInjectorTransportAdapter.{ One, All, Drop } +import akka.remote.transport.FailureInjectorTransportAdapter.{ One, Drop } import scala.concurrent.Await object AkkaProtocolStressTest { diff --git a/akka-remote/src/test/scala/akka/remote/transport/SystemMessageDeliveryStressTest.scala b/akka-remote/src/test/scala/akka/remote/transport/SystemMessageDeliveryStressTest.scala index 35e2aacade..933c2747f0 100644 --- a/akka-remote/src/test/scala/akka/remote/transport/SystemMessageDeliveryStressTest.scala +++ b/akka-remote/src/test/scala/akka/remote/transport/SystemMessageDeliveryStressTest.scala @@ -9,12 +9,11 @@ import akka.testkit.DefaultTimeout import akka.testkit.ImplicitSender import akka.testkit.{ TimingTest, DefaultTimeout, ImplicitSender, AkkaSpec } import com.typesafe.config.{ Config, ConfigFactory } -import AkkaProtocolStressTest._ import akka.actor._ import scala.concurrent.duration._ import akka.testkit._ import akka.remote.{ QuarantinedEvent, EndpointException, RARP } -import akka.remote.transport.FailureInjectorTransportAdapter.{ One, All, Drop } +import akka.remote.transport.FailureInjectorTransportAdapter.{ One, Drop } import scala.concurrent.Await import akka.actor.ActorRef import akka.actor.Actor @@ -27,9 +26,7 @@ import akka.remote.transport.FailureInjectorTransportAdapter.One import akka.remote.transport.FailureInjectorTransportAdapter.Drop import akka.testkit.TestEvent import akka.testkit.EventFilter -import akka.event.Logging import akka.dispatch.sysmsg.{ Failed, SystemMessage } -import akka.pattern.pipe object SystemMessageDeliveryStressTest { val msgCount = 5000 diff --git a/akka-slf4j/src/test/scala/akka/event/slf4j/Slf4jLoggerSpec.scala b/akka-slf4j/src/test/scala/akka/event/slf4j/Slf4jLoggerSpec.scala index fb336f7081..8d5dc0cda7 100644 --- a/akka-slf4j/src/test/scala/akka/event/slf4j/Slf4jLoggerSpec.scala +++ b/akka-slf4j/src/test/scala/akka/event/slf4j/Slf4jLoggerSpec.scala @@ -6,11 +6,10 @@ package akka.event.slf4j import language.postfixOps import akka.testkit.AkkaSpec -import akka.actor.{ DiagnosticActorLogging, Actor, ActorLogging, Props } +import akka.actor.{ DiagnosticActorLogging, Actor, Props } import scala.concurrent.duration._ import akka.event.Logging import ch.qos.logback.core.OutputStreamAppender -import java.io.StringWriter import java.io.ByteArrayOutputStream import org.scalatest.BeforeAndAfterEach diff --git a/akka-slf4j/src/test/scala/akka/event/slf4j/Slf4jLoggingFilterSpec.scala b/akka-slf4j/src/test/scala/akka/event/slf4j/Slf4jLoggingFilterSpec.scala index ea8ccfc7ed..f1a54aa13e 100644 --- a/akka-slf4j/src/test/scala/akka/event/slf4j/Slf4jLoggingFilterSpec.scala +++ b/akka-slf4j/src/test/scala/akka/event/slf4j/Slf4jLoggingFilterSpec.scala @@ -3,14 +3,10 @@ */ package akka.event.slf4j -import language.postfixOps import akka.testkit.AkkaSpec -import akka.actor.{ DiagnosticActorLogging, Actor, ActorLogging, Props } +import akka.actor.{ Actor, ActorLogging, Props } import scala.concurrent.duration._ import akka.event.Logging -import ch.qos.logback.core.OutputStreamAppender -import java.io.StringWriter -import java.io.ByteArrayOutputStream import org.scalatest.BeforeAndAfterEach import akka.actor.ActorRef import akka.event.Logging.InitializeLogger @@ -20,8 +16,6 @@ import akka.testkit.TestProbe import akka.event.Logging.Warning import akka.event.Logging.Info import akka.event.Logging.Debug -import akka.event.LoggingAdapter -import akka.event.LogSource object Slf4jLoggingFilterSpec { @@ -80,7 +74,6 @@ class Slf4jLoggingFilterSpec extends AkkaSpec(Slf4jLoggingFilterSpec.config) wit "Slf4jLoggingFilter" must { "use configured LoggingFilter at debug log level in logback conf" in { - import LogSource.fromClass val log1 = Logging(system, classOf[DebugLevelProducer]) log1.isDebugEnabled should be(true) log1.isInfoEnabled should be(true) @@ -89,7 +82,6 @@ class Slf4jLoggingFilterSpec extends AkkaSpec(Slf4jLoggingFilterSpec.config) wit } "use configured LoggingFilter at warning log level in logback conf" in { - import LogSource.fromClass val log1 = Logging(system, classOf[WarningLevelProducer]) log1.isDebugEnabled should be(false) log1.isInfoEnabled should be(false) diff --git a/akka-stream-testkit/src/main/scala/akka/stream/testkit/scaladsl/TestSource.scala b/akka-stream-testkit/src/main/scala/akka/stream/testkit/scaladsl/TestSource.scala index a55a3910e0..9c1d8ce62f 100644 --- a/akka-stream-testkit/src/main/scala/akka/stream/testkit/scaladsl/TestSource.scala +++ b/akka-stream-testkit/src/main/scala/akka/stream/testkit/scaladsl/TestSource.scala @@ -4,7 +4,6 @@ package akka.stream.testkit.scaladsl import akka.stream._ -import akka.stream.impl._ import akka.stream.Attributes.none import akka.stream.scaladsl._ import akka.stream.testkit._ diff --git a/akka-stream-testkit/src/test/scala/akka/stream/testkit/BaseTwoStreamsSetup.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/BaseTwoStreamsSetup.scala index 0870068810..07d5aef914 100644 --- a/akka-stream-testkit/src/test/scala/akka/stream/testkit/BaseTwoStreamsSetup.scala +++ b/akka-stream-testkit/src/test/scala/akka/stream/testkit/BaseTwoStreamsSetup.scala @@ -3,7 +3,7 @@ */ package akka.stream.testkit -import akka.stream.{ ActorMaterializer, ActorMaterializerSettings, Inlet, Outlet } +import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } import akka.stream.scaladsl._ import org.reactivestreams.Publisher import scala.collection.immutable diff --git a/akka-stream-testkit/src/test/scala/akka/stream/testkit/Coroner.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/Coroner.scala index 7d851dc268..e86a967bd6 100644 --- a/akka-stream-testkit/src/test/scala/akka/stream/testkit/Coroner.scala +++ b/akka-stream-testkit/src/test/scala/akka/stream/testkit/Coroner.scala @@ -7,8 +7,6 @@ import java.io.PrintStream import java.lang.management.{ ManagementFactory, ThreadInfo } import java.util.Date import java.util.concurrent.{ TimeoutException, CountDownLatch } -import org.scalatest.{ BeforeAndAfterAll, Suite } -import scala.annotation.tailrec import scala.concurrent.{ Promise, Awaitable, CanAwait, Await } import scala.concurrent.duration._ import scala.util.control.NonFatal @@ -268,4 +266,4 @@ trait WatchedByCoroner { def displayThreadCounts: Boolean = true def startAndStopDuration: FiniteDuration = Coroner.defaultStartAndStopDuration -} \ No newline at end of file +} diff --git a/akka-stream-testkit/src/test/scala/akka/stream/testkit/TwoStreamsSetup.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/TwoStreamsSetup.scala index 9c0785a167..543fae309c 100644 --- a/akka-stream-testkit/src/test/scala/akka/stream/testkit/TwoStreamsSetup.scala +++ b/akka-stream-testkit/src/test/scala/akka/stream/testkit/TwoStreamsSetup.scala @@ -3,9 +3,6 @@ package akka.stream.testkit import akka.stream._ import akka.stream.scaladsl._ import org.reactivestreams.Publisher -import scala.collection.immutable -import scala.util.control.NoStackTrace -import akka.stream.testkit.Utils._ abstract class TwoStreamsSetup extends BaseTwoStreamsSetup { diff --git a/akka-stream-testkit/src/test/scala/akka/stream/testkit/Utils.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/Utils.scala index 561df33d19..214e068876 100644 --- a/akka-stream-testkit/src/test/scala/akka/stream/testkit/Utils.scala +++ b/akka-stream-testkit/src/test/scala/akka/stream/testkit/Utils.scala @@ -7,7 +7,6 @@ import akka.stream.impl._ import akka.testkit.TestProbe import com.typesafe.config.ConfigFactory import scala.concurrent.duration._ -import scala.util.Try import scala.util.control.NoStackTrace object Utils { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala index 153f4e2024..e82d9a7814 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala @@ -6,9 +6,6 @@ package akka.stream.tck import java.util.concurrent.Executors import java.util.concurrent.ExecutorService import java.util.concurrent.TimeUnit -import scala.concurrent.duration._ -import akka.stream.ActorMaterializer -import akka.stream.scaladsl.{ Flow, Sink, Source } import akka.stream.testkit.TestPublisher import org.reactivestreams.{ Subscriber, Subscription, Processor, Publisher } import org.reactivestreams.tck.IdentityProcessorVerification diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala index 34335f681a..411fa7d5f6 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala @@ -4,19 +4,12 @@ package akka.stream.tck import scala.collection.immutable -import akka.event.Logging -import scala.concurrent.duration._ -import akka.actor.ActorSystem import akka.stream.ActorMaterializerSettings import akka.stream.ActorMaterializer -import akka.stream.testkit.AkkaSpec import akka.stream.testkit.TestPublisher import org.reactivestreams.Publisher import org.reactivestreams.tck.{ PublisherVerification, TestEnvironment } import org.scalatest.testng.TestNGSuiteLike -import org.testng.annotations.AfterClass -import akka.actor.ActorSystemImpl -import java.util.concurrent.TimeoutException abstract class AkkaPublisherVerification[T](val env: TestEnvironment, publisherShutdownTimeout: Long) extends PublisherVerification[T](env, publisherShutdownTimeout) diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala index 7106a8d75a..674582d9ab 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala @@ -3,22 +3,13 @@ */ package akka.stream.tck -import akka.event.Logging - -import scala.collection.immutable -import scala.concurrent.duration._ import akka.actor.ActorSystem import akka.stream.ActorMaterializerSettings import akka.stream.ActorMaterializer -import akka.stream.scaladsl.Sink -import akka.stream.scaladsl.Source -import akka.stream.testkit.AkkaSpec -import org.reactivestreams.Publisher import org.reactivestreams.tck.SubscriberBlackboxVerification import org.reactivestreams.tck.SubscriberWhiteboxVerification import org.reactivestreams.tck.TestEnvironment import org.scalatest.testng.TestNGSuiteLike -import org.testng.annotations.AfterClass abstract class AkkaSubscriberBlackboxVerification[T](env: TestEnvironment) extends SubscriberBlackboxVerification[T](env) with TestNGSuiteLike diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/EmptyPublisherTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/EmptyPublisherTest.scala index 912970131c..68a1dec0b7 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/EmptyPublisherTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/EmptyPublisherTest.scala @@ -4,9 +4,6 @@ package akka.stream.tck import org.reactivestreams.Publisher -import org.reactivestreams.Subscriber -import akka.stream.scaladsl.Source -import akka.stream.scaladsl.Sink import akka.stream.impl.EmptyPublisher class EmptyPublisherTest extends AkkaPublisherVerification[Int] { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FilePublisherTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FilePublisherTest.scala index e03ab028f6..e72fdd1133 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FilePublisherTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FilePublisherTest.scala @@ -8,7 +8,7 @@ import java.io.{ File, FileWriter } import akka.actor.ActorSystem import akka.event.Logging import akka.stream.scaladsl.FileIO -import akka.stream.scaladsl.{ Source, Sink } +import akka.stream.scaladsl.{ Sink } import akka.stream.testkit._ import akka.stream.testkit.Utils._ import akka.testkit.{ EventFilter, TestEvent } diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FusableProcessorTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FusableProcessorTest.scala index 02ac4542d9..f277d897bf 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FusableProcessorTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FusableProcessorTest.scala @@ -4,7 +4,6 @@ package akka.stream.tck import akka.NotUsed -import akka.stream.impl.Stages import akka.stream._ import akka.stream.impl.fusing.GraphStages import akka.stream.scaladsl.Flow diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/IterablePublisherTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/IterablePublisherTest.scala index 0b3cf09e83..ae027c1fb0 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/IterablePublisherTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/IterablePublisherTest.scala @@ -3,7 +3,6 @@ */ package akka.stream.tck -import scala.collection.immutable import akka.stream.scaladsl.Sink import akka.stream.scaladsl.Source import org.reactivestreams._ diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/MapTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/MapTest.scala index 552dff30ff..0987feae12 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/MapTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/MapTest.scala @@ -6,7 +6,6 @@ package akka.stream.tck import akka.stream.ActorMaterializer import akka.stream.scaladsl.Flow import org.reactivestreams.Processor -import akka.stream.Attributes class MapTest extends AkkaIdentityProcessorVerification[Int] { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/MaybeSourceTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/MaybeSourceTest.scala index d4cfb56c40..7f802607e3 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/MaybeSourceTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/MaybeSourceTest.scala @@ -4,7 +4,6 @@ package akka.stream.tck import org.reactivestreams.Publisher -import org.reactivestreams.Subscriber import akka.stream.scaladsl.{ Keep, Source, Sink } class MaybeSourceTest extends AkkaPublisherVerification[Int] { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/PrefixAndTailTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/PrefixAndTailTest.scala index c439c7b5f8..9c5ee215cf 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/PrefixAndTailTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/PrefixAndTailTest.scala @@ -3,7 +3,6 @@ */ package akka.stream.tck -import scala.collection.immutable import scala.concurrent.Await import scala.concurrent.duration._ import akka.stream.scaladsl.Sink diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/Timeouts.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/Timeouts.scala index c87ea77f38..00616086f7 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/Timeouts.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/Timeouts.scala @@ -3,10 +3,6 @@ */ package akka.stream.tck -import akka.actor.ActorSystem -import scala.concurrent.duration._ -import akka.testkit._ - /** * Specifies timeouts for the TCK */ diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/TransformProcessorTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/TransformProcessorTest.scala index 51f30b8967..03cff40e30 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/TransformProcessorTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/TransformProcessorTest.scala @@ -4,11 +4,9 @@ package akka.stream.tck import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } -import akka.stream.impl.ActorMaterializerImpl import akka.stream.scaladsl.Flow -import akka.stream.Attributes import akka.stream.stage.{ Context, PushStage } -import org.reactivestreams.{ Processor, Publisher } +import org.reactivestreams.{ Processor } class TransformProcessorTest extends AkkaIdentityProcessorVerification[Int] { diff --git a/akka-stream-tests/src/test/scala/akka/stream/ActorMaterializerSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/ActorMaterializerSpec.scala index 70f6946a69..648f169477 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/ActorMaterializerSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/ActorMaterializerSpec.scala @@ -4,7 +4,7 @@ import akka.actor.{ ActorSystem, Props } import akka.stream.impl.{ StreamSupervisor, ActorMaterializerImpl } import akka.stream.scaladsl.{ Sink, Source } import akka.stream.testkit.AkkaSpec -import akka.testkit.{ TestActor, ImplicitSender, TestProbe } +import akka.testkit.{ TestActor, ImplicitSender } import scala.concurrent.Await import scala.concurrent.duration._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/FusingSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FusingSpec.scala index 2a39f338e9..6afd6120e2 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/FusingSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/FusingSpec.scala @@ -3,7 +3,6 @@ */ package akka.stream -import akka.stream._ import akka.stream.scaladsl._ import akka.stream.testkit.AkkaSpec import org.scalactic.ConversionCheckedTripleEquals diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/GraphStageLogicSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/GraphStageLogicSpec.scala index 3ec4648c2b..66c22f124b 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/GraphStageLogicSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/GraphStageLogicSpec.scala @@ -12,7 +12,6 @@ import akka.stream.stage._ import akka.stream.testkit.Utils.assertAllStagesStopped import akka.stream.testkit.scaladsl.TestSink import akka.stream.impl.fusing._ -import akka.stream.impl.fusing.GraphInterpreter._ import org.scalactic.ConversionCheckedTripleEquals import org.scalatest.concurrent.ScalaFutures import scala.concurrent.duration.Duration diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/StreamLayoutSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/StreamLayoutSpec.scala index 905e5f4655..be3b0fcbf0 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/StreamLayoutSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/StreamLayoutSpec.scala @@ -7,7 +7,6 @@ import akka.stream.scaladsl._ import akka.stream.testkit.AkkaSpec import org.reactivestreams.{ Subscription, Subscriber, Publisher } import akka.stream._ -import akka.event.Logging.simpleName class StreamLayoutSpec extends AkkaSpec { import StreamLayout._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSpec.scala index c8309537f8..e49ec9cf39 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSpec.scala @@ -8,7 +8,6 @@ import akka.stream.stage._ import akka.stream.testkit.AkkaSpec import akka.testkit.EventFilter -import scala.util.control.NoStackTrace import akka.stream.Supervision class InterpreterSpec extends AkkaSpec with GraphInterpreterSpecKit { diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterStressSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterStressSpec.scala index 53ee9ee091..5f9bb08b4d 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterStressSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterStressSpec.scala @@ -3,11 +3,8 @@ */ package akka.stream.impl.fusing -import akka.NotUsed import akka.stream.impl.ConstantFun -import akka.stream.{ Attributes, Shape, Supervision } -import akka.stream.stage.AbstractStage.PushPullGraphStage -import akka.stream.stage.GraphStageWithMaterializedValue +import akka.stream.{ Supervision } import akka.stream.testkit.AkkaSpec class InterpreterStressSpec extends AkkaSpec with GraphInterpreterSpecKit { diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSupervisionSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSupervisionSpec.scala index 1e2531c1c8..4f80afce0e 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSupervisionSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSupervisionSpec.scala @@ -6,7 +6,6 @@ package akka.stream.impl.fusing import scala.util.control.NoStackTrace import akka.stream.Supervision import akka.stream.stage.Context -import akka.stream.stage.Directive import akka.stream.stage.PushPullStage import akka.stream.stage.Stage import akka.stream.stage.TerminationDirective diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/IteratorInterpreterSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/IteratorInterpreterSpec.scala index 65912590eb..c3a2e46d13 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/IteratorInterpreterSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/IteratorInterpreterSpec.scala @@ -3,7 +3,6 @@ */ package akka.stream.impl.fusing -import scala.collection.immutable import akka.stream.testkit.AkkaSpec import akka.util.ByteString import akka.stream.stage._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/KeepGoingStageSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/KeepGoingStageSpec.scala index c871343f19..a503afe39d 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/KeepGoingStageSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/KeepGoingStageSpec.scala @@ -4,7 +4,7 @@ package akka.stream.impl.fusing import akka.actor.{ NoSerializationVerificationNeeded, ActorRef } -import akka.stream.scaladsl.{ Keep, Source, Sink } +import akka.stream.scaladsl.{ Keep, Source } import akka.stream.{ Attributes, Inlet, SinkShape, ActorMaterializer } import akka.stream.stage.{ InHandler, AsyncCallback, GraphStageLogic, GraphStageWithMaterializedValue } import akka.stream.testkit.AkkaSpec diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSourceSpec.scala index 2168ccf405..24f1c15c8f 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSourceSpec.scala @@ -3,14 +3,14 @@ */ package akka.stream.io -import java.io.{ OutputStream, PipedOutputStream, PipedInputStream, InputStream } +import java.io.{ InputStream } import java.util.concurrent.CountDownLatch -import akka.stream.scaladsl.{ Source, Sink, StreamConverters } +import akka.stream.scaladsl.{ Sink, StreamConverters } import akka.stream.testkit._ import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.TestSink -import akka.stream.{ Attributes, OverflowStrategy, ActorMaterializer, ActorMaterializerSettings } +import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } import akka.util.ByteString import org.scalatest.concurrent.ScalaFutures import scala.concurrent.Await diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSinkSpec.scala index 7e9ccb771e..d05aec423a 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSinkSpec.scala @@ -5,7 +5,7 @@ package akka.stream.io import java.io.OutputStream -import akka.stream.scaladsl.{ Source, Sink, StreamConverters } +import akka.stream.scaladsl.{ Source, StreamConverters } import akka.stream.testkit._ import akka.stream.testkit.Utils._ import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/TcpHelper.scala b/akka-stream-tests/src/test/scala/akka/stream/io/TcpHelper.scala index 64ae45831d..2d6928afae 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/TcpHelper.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/TcpHelper.scala @@ -4,7 +4,7 @@ package akka.stream.io import akka.actor._ -import akka.io.Tcp.{ ResumeReading, Register, ConnectionClosed, Closed } +import akka.io.Tcp.{ ResumeReading, ConnectionClosed } import akka.io.{ IO, Tcp } import akka.stream.testkit._ import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowCollectSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowCollectSpec.scala index 37550a7360..f03f74ee3b 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowCollectSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowCollectSpec.scala @@ -3,8 +3,6 @@ */ package akka.stream.scaladsl -import java.io.{ File, FileInputStream } - import scala.concurrent.forkjoin.ThreadLocalRandom.{ current ⇒ random } import akka.stream.ActorMaterializerSettings diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatAllSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatAllSpec.scala index cde6e0ef71..fff4d2623c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatAllSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatAllSpec.scala @@ -6,7 +6,6 @@ package akka.stream.scaladsl import akka.NotUsed import akka.stream.impl.ConstantFun -import scala.concurrent.duration._ import scala.util.control.NoStackTrace import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDetacherSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDetacherSpec.scala index ecc050efea..ac39e44a55 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDetacherSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDetacherSpec.scala @@ -7,7 +7,6 @@ import org.scalactic.ConversionCheckedTripleEquals import org.scalatest.concurrent.ScalaFutures import akka.stream.testkit.AkkaSpec import akka.stream._ -import akka.stream.scaladsl._ import scala.concurrent.Await import scala.concurrent.duration._ import akka.stream.testkit.scaladsl.TestSink diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGraphCompileSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGraphCompileSpec.scala index fac9aaee31..cf04794a77 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGraphCompileSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGraphCompileSpec.scala @@ -3,7 +3,6 @@ */ package akka.stream.scaladsl -import akka.stream.Attributes._ import akka.stream.{ ClosedShape, ActorMaterializer, OverflowStrategy } import akka.stream.testkit._ import akka.stream.stage._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupBySpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupBySpec.scala index 27478ecd76..e7da7b9d95 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupBySpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupBySpec.scala @@ -6,14 +6,12 @@ package akka.stream.scaladsl import akka.NotUsed import scala.concurrent.duration._ -import scala.util.control.NoStackTrace import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.Supervision.resumingDecider import akka.stream.testkit._ import akka.stream.testkit.Utils._ import org.reactivestreams.Publisher -import akka.stream.Attributes import akka.stream.ActorAttributes import org.scalatest.concurrent.ScalaFutures import org.scalactic.ConversionCheckedTripleEquals @@ -22,7 +20,6 @@ import akka.stream.testkit.scaladsl.TestSource import akka.stream.testkit.scaladsl.TestSink object FlowGroupBySpec { - import language.higherKinds implicit class Lift[M](val f: SubFlow[Int, M, Source[Int, M]#Repr, RunnableGraph[M]]) extends AnyVal { def lift(key: Int ⇒ Int) = f.prefixAndTail(1).map(p ⇒ key(p._1.head) -> (Source.single(p._1.head) ++ p._2)).concatSubstreams diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIntersperseSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIntersperseSpec.scala index fb63242dc5..32a48addcf 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIntersperseSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIntersperseSpec.scala @@ -4,7 +4,6 @@ package akka.stream.scaladsl import akka.stream.testkit._ -import akka.stream.testkit.Utils.assertAllStagesStopped import akka.stream.testkit.scaladsl.{ TestSource, TestSink } import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } import org.scalatest.concurrent.ScalaFutures diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala index a140f96f58..66acf0338a 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala @@ -10,9 +10,6 @@ import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.testkit._ import akka.stream.testkit.Utils._ -import org.reactivestreams.Subscription -import akka.testkit.TestProbe -import org.reactivestreams.Subscriber import akka.testkit.EventFilter class FlowIteratorSpec extends AbstractFlowIteratorSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala index 85e6fa4c81..97e2d37a10 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala @@ -4,7 +4,6 @@ package akka.stream.scaladsl import akka.stream.{ FlowShape, ActorMaterializer, ActorMaterializerSettings, OverflowStrategy } -import akka.stream.impl.fusing.GraphStages.Detacher import akka.stream.testkit._ import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl._ @@ -13,8 +12,6 @@ import org.scalatest.concurrent.ScalaFutures import org.scalatest.time._ import scala.collection.immutable -import scala.concurrent.Await -import scala.concurrent.duration._ class FlowJoinSpec extends AkkaSpec(ConfigFactory.parseString("akka.loglevel=INFO")) with ScalaFutures { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncSpec.scala index 9446c11cda..ed2fdf1b17 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncSpec.scala @@ -9,7 +9,6 @@ import scala.concurrent.duration._ import scala.concurrent.forkjoin.ThreadLocalRandom import scala.util.control.NoStackTrace import akka.stream.ActorMaterializer -import akka.stream.stage._ import akka.stream.testkit._ import akka.stream.testkit.Utils._ import akka.testkit.TestLatch @@ -17,10 +16,6 @@ import akka.testkit.TestProbe import akka.stream.ActorAttributes.supervisionStrategy import akka.stream.Supervision.resumingDecider import akka.stream.impl.ReactiveStreamsCompliance -import scala.util.Try -import scala.concurrent.ExecutionContext -import scala.util.Failure -import scala.util.Success import scala.annotation.tailrec import scala.concurrent.Promise import java.util.concurrent.atomic.AtomicInteger diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncUnorderedSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncUnorderedSpec.scala index b8e10b79f6..4cdba994f5 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncUnorderedSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncUnorderedSpec.scala @@ -7,7 +7,7 @@ import scala.concurrent.Await import scala.concurrent.Future import scala.concurrent.duration._ import scala.util.control.NoStackTrace -import akka.stream.{ ActorMaterializerSettings, ActorMaterializer } +import akka.stream.{ ActorMaterializer } import akka.stream.testkit._ import akka.stream.testkit.scaladsl._ import akka.stream.testkit.Utils._ @@ -17,7 +17,6 @@ import akka.stream.ActorAttributes.supervisionStrategy import akka.stream.Supervision.resumingDecider import akka.stream.impl.ReactiveStreamsCompliance import java.util.concurrent.atomic.AtomicInteger -import java.util.concurrent.ConcurrentLinkedQueue import scala.concurrent.Promise import java.util.concurrent.LinkedBlockingQueue import scala.annotation.tailrec diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrefixAndTailSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrefixAndTailSpec.scala index ecad4a64b0..e341a73fbe 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrefixAndTailSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrefixAndTailSpec.scala @@ -4,12 +4,10 @@ package akka.stream.scaladsl import scala.collection.immutable -import scala.concurrent.{ Future, Await } +import scala.concurrent.{ Await } import scala.concurrent.duration._ -import scala.util.Try import scala.util.control.NoStackTrace import akka.stream._ -import org.reactivestreams.Subscriber import akka.stream.testkit._ import akka.stream.testkit.Utils._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSectionSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSectionSpec.scala index 9a9007e2a6..da36aea1c7 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSectionSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSectionSpec.scala @@ -5,7 +5,7 @@ package akka.stream.scaladsl import akka.stream.Attributes._ import akka.stream.ActorAttributes._ -import akka.stream.{ FlowShape, ActorMaterializer } +import akka.stream.{ ActorMaterializer } import akka.stream.testkit.AkkaSpec import akka.actor.ActorRef import akka.testkit.TestProbe diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSlidingSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSlidingSpec.scala index c9c470ba86..9134970224 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSlidingSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSlidingSpec.scala @@ -3,7 +3,6 @@ */ package akka.stream.scaladsl -import akka.actor.Status.Failure import akka.stream.testkit.Utils._ import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } import akka.stream.testkit._ @@ -12,8 +11,6 @@ import org.scalatest.concurrent.ScalaFutures import org.scalatest.prop.GeneratorDrivenPropertyChecks import akka.pattern.pipe -import scala.concurrent.Await - class FlowSlidingSpec extends AkkaSpec with GeneratorDrivenPropertyChecks with ScalaFutures { import system.dispatcher val settings = ActorMaterializerSettings(system) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala index ce149fa21f..3360f5cfce 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala @@ -10,10 +10,8 @@ import akka.stream.impl._ import akka.stream.impl.fusing.{ ActorGraphInterpreter } import akka.stream.impl.fusing.GraphInterpreter.GraphAssembly import akka.stream.stage.AbstractStage.PushPullGraphStage -import akka.stream.stage.{ GraphStageLogic, OutHandler, InHandler, Stage } import akka.stream.testkit.Utils._ import akka.stream.testkit._ -import akka.stream.testkit.scaladsl.TestSink import akka.stream._ import akka.testkit.TestEvent.{ Mute, UnMute } import akka.testkit.{ EventFilter, TestDuration } @@ -48,8 +46,6 @@ class FlowSpec extends AkkaSpec(ConfigFactory.parseString("akka.actor.debug.rece class BrokenActorInterpreter(_shell: GraphInterpreterShell, brokenMessage: Any) extends ActorGraphInterpreter(_shell) { - import akka.stream.actor.ActorSubscriberMessage._ - override protected[akka] def aroundReceive(receive: Receive, msg: Any) = { msg match { case ActorGraphInterpreter.OnNext(_, 0, m) if m == brokenMessage ⇒ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitAfterSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitAfterSpec.scala index 67da5e2661..53a31da1aa 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitAfterSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitAfterSpec.scala @@ -17,7 +17,6 @@ import akka.stream.StreamSubscriptionTimeoutSettings import akka.stream.StreamSubscriptionTimeoutTerminationMode object FlowSplitAfterSpec { - import language.higherKinds implicit class Lift[M](val f: SubFlow[Int, M, Source[Int, M]#Repr, RunnableGraph[M]]) extends AnyVal { def lift = f.prefixAndTail(0).map(_._2).concatSubstreams diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowStageSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowStageSpec.scala index 3525c86702..efc23f9b68 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowStageSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowStageSpec.scala @@ -3,10 +3,8 @@ */ package akka.stream.scaladsl -import akka.actor.PoisonPill -import akka.stream.{ Attributes, OverflowStrategy, ActorMaterializer, ActorMaterializerSettings } +import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } import akka.stream.stage._ -import scala.collection.immutable.Seq import scala.concurrent.duration._ import scala.util.control.NoStackTrace import akka.stream.ActorMaterializer diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSupervisionSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSupervisionSpec.scala index bdf68a8249..2c1d468b4c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSupervisionSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSupervisionSpec.scala @@ -6,7 +6,6 @@ package akka.stream.scaladsl import scala.collection.immutable import scala.concurrent.duration._ import akka.stream.ActorMaterializer -import akka.stream.ActorMaterializerSettings import akka.stream.testkit._ import scala.util.control.NoStackTrace import scala.concurrent.Await diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchTerminationSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchTerminationSpec.scala index fb73e1323c..dc3f1f4244 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchTerminationSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchTerminationSpec.scala @@ -3,7 +3,6 @@ */ package akka.stream.scaladsl -import akka.actor.Status.Failure import akka.Done import akka.pattern.pipe import akka.stream._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphConcatSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphConcatSpec.scala index deff492678..28cd0fa478 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphConcatSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphConcatSpec.scala @@ -3,11 +3,9 @@ */ package akka.stream.scaladsl -import scala.concurrent.{ Await, Promise } -import scala.concurrent.duration._ +import scala.concurrent.{ Promise } import akka.stream._ -import akka.stream.scaladsl._ import akka.stream.testkit._ import akka.stream.testkit.Utils._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMatValueSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMatValueSpec.scala index b13974afcf..f6613697fe 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMatValueSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMatValueSpec.scala @@ -3,7 +3,6 @@ */ package akka.stream.scaladsl -import akka.NotUsed import akka.stream._ import akka.stream.testkit._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeSortedSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeSortedSpec.scala index d06c24b47c..8a78a13560 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeSortedSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeSortedSpec.scala @@ -4,10 +4,8 @@ package akka.stream.scaladsl import akka.stream._ -import akka.stream.scaladsl._ import akka.stream.testkit.TwoStreamsSetup import org.scalacheck.Gen -import scala.util.Random import org.scalatest.prop.GeneratorDrivenPropertyChecks import org.scalatest.concurrent.ScalaFutures import scala.concurrent.duration._ @@ -15,7 +13,6 @@ import org.scalactic.ConversionCheckedTripleEquals import org.scalacheck.Shrink class GraphMergeSortedSpec extends TwoStreamsSetup with GeneratorDrivenPropertyChecks with ScalaFutures with ConversionCheckedTripleEquals { - import GraphDSL.Implicits._ override type Outputs = Int diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphOpsIntegrationSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphOpsIntegrationSpec.scala index 8149ee9e3c..72e1529f34 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphOpsIntegrationSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphOpsIntegrationSpec.scala @@ -7,7 +7,6 @@ import scala.concurrent.{ Future, Await } import scala.concurrent.duration._ import akka.stream._ import akka.stream.testkit._ -import akka.util.ByteString import org.scalactic.ConversionCheckedTripleEquals object GraphOpsIntegrationSpec { @@ -90,7 +89,6 @@ class GraphOpsIntegrationSpec extends AkkaSpec with ConversionCheckedTripleEqual } "support wikipedia Topological_sorting 2" in { - import Attributes.name // see https://en.wikipedia.org/wiki/Topological_sorting#mediaviewer/File:Directed_acyclic_graph.png val seqSink = Sink.head[Seq[Int]] diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartialSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartialSpec.scala index 162224b859..e2994a36c6 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartialSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartialSpec.scala @@ -3,11 +3,10 @@ package akka.stream.scaladsl import akka.stream.{ ClosedShape, ActorMaterializer, ActorMaterializerSettings, FlowShape } import akka.stream.testkit.AkkaSpec -import scala.concurrent.{ Await, Future } +import scala.concurrent.{ Await } import scala.concurrent.duration._ class GraphPartialSpec extends AkkaSpec { - import GraphDSL.Implicits._ val settings = ActorMaterializerSettings(system) .withInputBuffer(initialSize = 2, maxSize = 16) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartitionSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartitionSpec.scala index d42bfa2b39..95420d9b04 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartitionSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartitionSpec.scala @@ -4,7 +4,6 @@ package akka.stream.scaladsl import akka.stream.testkit._ -import akka.stream.testkit.scaladsl.TestSink import akka.stream.{ OverflowStrategy, ActorMaterializer, ActorMaterializerSettings, ClosedShape } import akka.stream.testkit.Utils._ import org.scalatest.concurrent.ScalaFutures diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HeadSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HeadSinkSpec.scala index 7b4f4ba185..eb780361d7 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HeadSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HeadSinkSpec.scala @@ -3,11 +3,9 @@ */ package akka.stream.scaladsl -import org.reactivestreams.Subscriber import scala.concurrent.Await import scala.concurrent.Future import scala.concurrent.duration._ -import scala.util.Failure import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LastSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LastSinkSpec.scala index b0680ef91a..799c1f9ca1 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LastSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LastSinkSpec.scala @@ -3,12 +3,8 @@ */ package akka.stream.scaladsl -import org.reactivestreams.Subscriber - import scala.concurrent.Await -import scala.concurrent.Future import scala.concurrent.duration._ -import scala.util.Failure import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/PublisherSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/PublisherSinkSpec.scala index c2d35e25bb..5c4665abda 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/PublisherSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/PublisherSinkSpec.scala @@ -14,7 +14,6 @@ import scala.concurrent.Await class PublisherSinkSpec extends AkkaSpec { implicit val materializer = ActorMaterializer() - import materializer.executionContext "A PublisherSink" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSinkSpec.scala index 7880e86285..fa3be143bb 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSinkSpec.scala @@ -6,7 +6,7 @@ package akka.stream.scaladsl import akka.actor.Status import akka.pattern.pipe import akka.stream.Attributes.inputBuffer -import akka.stream.{ OverflowStrategy, ActorMaterializer } +import akka.stream.{ ActorMaterializer } import akka.stream.testkit.Utils._ import akka.stream.testkit.{ AkkaSpec, _ } import org.scalatest.concurrent.ScalaFutures diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSourceSpec.scala index 1844b889cf..e94817a983 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSourceSpec.scala @@ -3,11 +3,10 @@ */ package akka.stream.scaladsl -import akka.actor.{ NoSerializationVerificationNeeded, Status } +import akka.actor.{ Status } import akka.pattern.pipe import akka.stream._ import akka.stream.impl.QueueSource -import akka.stream.stage.OutHandler import akka.stream.testkit.Utils._ import akka.stream.testkit._ import akka.testkit.TestProbe diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala index 7ab1666fd7..d20f03fde2 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala @@ -4,7 +4,6 @@ package akka.stream.scaladsl import akka.stream._ -import akka.stream.testkit.TestPublisher.ManualProbe import akka.stream.testkit._ import org.scalactic.ConversionCheckedTripleEquals import org.scalatest.concurrent.ScalaFutures diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StageActorRefSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StageActorRefSpec.scala index ddf076f1ce..53e24f20cc 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StageActorRefSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StageActorRefSpec.scala @@ -6,11 +6,9 @@ package akka.stream.scaladsl import akka.actor.{ Kill, PoisonPill, NoSerializationVerificationNeeded, ActorRef } import akka.event.Logging import akka.stream._ -import akka.stream.stage.GraphStageLogic.StageActorRef -import akka.stream.stage.{ GraphStageWithMaterializedValue, GraphStage, GraphStageLogic, InHandler } +import akka.stream.stage.{ GraphStageWithMaterializedValue, GraphStageLogic, InHandler } import akka.stream.testkit.AkkaSpec import akka.testkit.{ TestProbe, TestEvent, EventFilter, ImplicitSender } -import org.scalatest.concurrent.PatienceConfiguration.Timeout import org.scalatest.concurrent.ScalaFutures import scala.concurrent.{ Future, Promise } diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSourceSpec.scala index 16d0dc46cc..3a728891b0 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSourceSpec.scala @@ -6,7 +6,6 @@ package akka.stream.scaladsl import akka.stream.ActorMaterializer import akka.stream.testkit.AkkaSpec -import akka.stream.testkit.Utils._ import scala.concurrent.duration._ import scala.concurrent.Await diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubstreamSubscriptionTimeoutSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubstreamSubscriptionTimeoutSpec.scala index b76c3d4388..4f6150da1f 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubstreamSubscriptionTimeoutSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubstreamSubscriptionTimeoutSpec.scala @@ -3,12 +3,10 @@ */ package akka.stream.scaladsl -import akka.actor.{ ExtendedActorSystem, ActorIdentity, ActorRef, Identify } import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } import akka.stream.impl.SubscriptionTimeoutException import akka.stream.testkit._ import akka.stream.testkit.Utils._ -import akka.util.Timeout import scala.concurrent.Await import scala.concurrent.duration._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TickSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TickSourceSpec.scala index d4cca479f1..87cea362c8 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TickSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TickSourceSpec.scala @@ -3,11 +3,8 @@ */ package akka.stream.scaladsl -import akka.actor.Cancellable - import scala.concurrent.duration._ -import scala.util.control.NoStackTrace -import akka.stream.{ ClosedShape, ActorMaterializer, ActorMaterializerSettings } +import akka.stream.{ ClosedShape, ActorMaterializer } import akka.stream.testkit._ import akka.stream.testkit.Utils._ diff --git a/akka-stream/src/main/scala/akka/stream/ActorMaterializer.scala b/akka-stream/src/main/scala/akka/stream/ActorMaterializer.scala index a073a29b32..730cb14977 100644 --- a/akka-stream/src/main/scala/akka/stream/ActorMaterializer.scala +++ b/akka-stream/src/main/scala/akka/stream/ActorMaterializer.scala @@ -5,7 +5,7 @@ package akka.stream import java.util.Locale import java.util.concurrent.TimeUnit -import java.util.concurrent.atomic.{ AtomicInteger, AtomicBoolean } +import java.util.concurrent.atomic.{ AtomicBoolean } import akka.actor.{ ActorContext, ActorRef, ActorRefFactory, ActorSystem, ExtendedActorSystem, Props } import akka.event.LoggingAdapter diff --git a/akka-stream/src/main/scala/akka/stream/Fusing.scala b/akka-stream/src/main/scala/akka/stream/Fusing.scala index 526ff4a945..d90abac97f 100644 --- a/akka-stream/src/main/scala/akka/stream/Fusing.scala +++ b/akka-stream/src/main/scala/akka/stream/Fusing.scala @@ -3,9 +3,7 @@ */ package akka.stream -import java.{ util ⇒ ju } import scala.collection.immutable -import scala.collection.JavaConverters._ import akka.stream.impl.StreamLayout._ import akka.stream.impl.fusing.{ Fusing ⇒ Impl } import scala.annotation.unchecked.uncheckedVariance diff --git a/akka-stream/src/main/scala/akka/stream/Materializer.scala b/akka-stream/src/main/scala/akka/stream/Materializer.scala index 10a5bd898d..32d739def7 100644 --- a/akka-stream/src/main/scala/akka/stream/Materializer.scala +++ b/akka-stream/src/main/scala/akka/stream/Materializer.scala @@ -6,7 +6,6 @@ package akka.stream import akka.actor.Cancellable import scala.concurrent.ExecutionContextExecutor -import akka.japi import scala.concurrent.duration.FiniteDuration diff --git a/akka-stream/src/main/scala/akka/stream/StreamTcpException.scala b/akka-stream/src/main/scala/akka/stream/StreamTcpException.scala index e57ee74100..89061a2cf8 100644 --- a/akka-stream/src/main/scala/akka/stream/StreamTcpException.scala +++ b/akka-stream/src/main/scala/akka/stream/StreamTcpException.scala @@ -4,7 +4,6 @@ package akka.stream import scala.util.control.NoStackTrace -import java.net.InetSocketAddress class StreamTcpException(msg: String) extends RuntimeException(msg) with NoStackTrace diff --git a/akka-stream/src/main/scala/akka/stream/Supervision.scala b/akka-stream/src/main/scala/akka/stream/Supervision.scala index d230ff448b..df11517319 100644 --- a/akka-stream/src/main/scala/akka/stream/Supervision.scala +++ b/akka-stream/src/main/scala/akka/stream/Supervision.scala @@ -3,7 +3,6 @@ */ package akka.stream -import scala.util.control.NonFatal import akka.japi.{ function ⇒ japi } object Supervision { diff --git a/akka-stream/src/main/scala/akka/stream/actor/ActorPublisher.scala b/akka-stream/src/main/scala/akka/stream/actor/ActorPublisher.scala index ce895fd69f..1a13f11ea7 100644 --- a/akka-stream/src/main/scala/akka/stream/actor/ActorPublisher.scala +++ b/akka-stream/src/main/scala/akka/stream/actor/ActorPublisher.scala @@ -111,7 +111,6 @@ object ActorPublisherMessage { * failure, completed or canceled. */ trait ActorPublisher[T] extends Actor { - import ActorPublisher._ import akka.stream.actor.ActorPublisherMessage._ import ActorPublisher.Internal._ import ActorPublisherMessage._ @@ -368,7 +367,6 @@ trait ActorPublisher[T] extends Actor { * INTERNAL API */ private[akka] final case class ActorPublisherImpl[T](ref: ActorRef) extends Publisher[T] { - import ActorPublisher._ import ActorPublisher.Internal._ override def subscribe(sub: Subscriber[_ >: T]): Unit = { @@ -381,7 +379,6 @@ private[akka] final case class ActorPublisherImpl[T](ref: ActorRef) extends Publ * INTERNAL API */ private[akka] class ActorPublisherSubscription[T](ref: ActorRef) extends Subscription { - import ActorPublisher._ import ActorPublisherMessage._ override def request(n: Long): Unit = ref ! Request(n) diff --git a/akka-stream/src/main/scala/akka/stream/extra/Implicits.scala b/akka-stream/src/main/scala/akka/stream/extra/Implicits.scala index 4e798badcd..b1a5cd40e7 100644 --- a/akka-stream/src/main/scala/akka/stream/extra/Implicits.scala +++ b/akka-stream/src/main/scala/akka/stream/extra/Implicits.scala @@ -3,7 +3,6 @@ */ package akka.stream.extra -import scala.language.implicitConversions import akka.stream.scaladsl.Flow import akka.stream.scaladsl.Source import scala.concurrent.duration.FiniteDuration @@ -53,4 +52,4 @@ object Implicits { Timed.timedIntervalBetween[I, O, Mat](flow, matching, onInterval) } -} \ No newline at end of file +} diff --git a/akka-stream/src/main/scala/akka/stream/extra/Timed.scala b/akka-stream/src/main/scala/akka/stream/extra/Timed.scala index f4ef087255..bbeb40cbec 100644 --- a/akka-stream/src/main/scala/akka/stream/extra/Timed.scala +++ b/akka-stream/src/main/scala/akka/stream/extra/Timed.scala @@ -5,10 +5,8 @@ package akka.stream.extra import java.util.concurrent.atomic.AtomicLong import scala.concurrent.duration._ -import scala.language.implicitConversions import scala.language.existentials -import akka.stream.Attributes._ -import akka.stream.scaladsl.{ Keep, Source, Flow } +import akka.stream.scaladsl.{ Source, Flow } import akka.stream.stage._ /** diff --git a/akka-stream/src/main/scala/akka/stream/impl/ActorMaterializerImpl.scala b/akka-stream/src/main/scala/akka/stream/impl/ActorMaterializerImpl.scala index 1674780d76..0ce74e67d3 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/ActorMaterializerImpl.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/ActorMaterializerImpl.scala @@ -3,7 +3,7 @@ */ package akka.stream.impl -import java.util.concurrent.atomic.{ AtomicBoolean, AtomicLong } +import java.util.concurrent.atomic.{ AtomicBoolean } import java.{ util ⇒ ju } import akka.NotUsed import akka.actor._ diff --git a/akka-stream/src/main/scala/akka/stream/impl/ActorPublisher.scala b/akka-stream/src/main/scala/akka/stream/impl/ActorPublisher.scala index 32e7151b9c..42d90c4d1c 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/ActorPublisher.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/ActorPublisher.scala @@ -6,9 +6,8 @@ package akka.stream.impl import java.util.concurrent.atomic.AtomicReference import scala.annotation.tailrec import scala.collection.immutable -import scala.util.control.{ NoStackTrace, NonFatal } -import akka.actor.{ Actor, ActorLogging, ActorRef, Props, Terminated } -import akka.stream.ActorMaterializerSettings +import scala.util.control.{ NoStackTrace } +import akka.actor.{ Actor, ActorRef, Terminated } import org.reactivestreams.{ Publisher, Subscriber } import org.reactivestreams.Subscription diff --git a/akka-stream/src/main/scala/akka/stream/impl/ActorRefBackpressureSinkStage.scala b/akka-stream/src/main/scala/akka/stream/impl/ActorRefBackpressureSinkStage.scala index c6c6188270..2060317e26 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/ActorRefBackpressureSinkStage.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/ActorRefBackpressureSinkStage.scala @@ -6,10 +6,8 @@ package akka.stream.impl import java.util import akka.actor._ -import akka.dispatch.sysmsg.{ DeathWatchNotification, SystemMessage, Watch } import akka.stream.impl.Stages.DefaultAttributes -import akka.stream.stage.GraphStageLogic.StageActor -import akka.stream.{ Inlet, SinkShape, ActorMaterializer, Attributes } +import akka.stream.{ Inlet, SinkShape, Attributes } import akka.stream.Attributes.InputBuffer import akka.stream.stage._ diff --git a/akka-stream/src/main/scala/akka/stream/impl/ActorRefSourceActor.scala b/akka-stream/src/main/scala/akka/stream/impl/ActorRefSourceActor.scala index ea99123816..20fa078c83 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/ActorRefSourceActor.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/ActorRefSourceActor.scala @@ -27,7 +27,6 @@ private[akka] object ActorRefSourceActor { private[akka] class ActorRefSourceActor(bufferSize: Int, overflowStrategy: OverflowStrategy, maxFixedBufferSize: Int) extends akka.stream.actor.ActorPublisher[Any] with ActorLogging { import akka.stream.actor.ActorPublisherMessage._ - import akka.stream.OverflowStrategy._ // when bufferSize is 0 there the buffer is not used protected val buffer = if (bufferSize == 0) null else Buffer[Any](bufferSize, maxFixedBufferSize) diff --git a/akka-stream/src/main/scala/akka/stream/impl/Buffers.scala b/akka-stream/src/main/scala/akka/stream/impl/Buffers.scala index 9daaa5ccaf..477f64f9eb 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/Buffers.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/Buffers.scala @@ -5,8 +5,6 @@ package akka.stream.impl import java.{ util ⇒ ju } import akka.stream._ -import scala.reflect.classTag -import scala.reflect.ClassTag /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/FanIn.scala b/akka-stream/src/main/scala/akka/stream/impl/FanIn.scala index 0c22494421..eefd19c1bc 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/FanIn.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/FanIn.scala @@ -4,7 +4,7 @@ package akka.stream.impl import akka.actor._ -import akka.stream.{ AbruptTerminationException, ActorMaterializerSettings, InPort, Shape } +import akka.stream.{ AbruptTerminationException, ActorMaterializerSettings } import akka.stream.actor.{ ActorSubscriberMessage, ActorSubscriber } import org.reactivestreams.{ Subscription, Subscriber } diff --git a/akka-stream/src/main/scala/akka/stream/impl/FanOut.scala b/akka-stream/src/main/scala/akka/stream/impl/FanOut.scala index e8ef61ade8..82b5e57f8c 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/FanOut.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/FanOut.scala @@ -3,7 +3,7 @@ */ package akka.stream.impl -import akka.stream.{ AbruptTerminationException, Shape, ActorMaterializerSettings } +import akka.stream.{ AbruptTerminationException, ActorMaterializerSettings } import scala.collection.immutable import akka.actor._ diff --git a/akka-stream/src/main/scala/akka/stream/impl/Messages.scala b/akka-stream/src/main/scala/akka/stream/impl/Messages.scala index acbe40903b..b9113f3916 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/Messages.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/Messages.scala @@ -4,7 +4,6 @@ package akka.stream.impl import language.existentials -import org.reactivestreams.Subscription import akka.actor.{ NoSerializationVerificationNeeded, DeadLetterSuppression } /** diff --git a/akka-stream/src/main/scala/akka/stream/impl/Modules.scala b/akka-stream/src/main/scala/akka/stream/impl/Modules.scala index 88e8b5533d..c3b1e232df 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/Modules.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/Modules.scala @@ -11,7 +11,6 @@ import org.reactivestreams._ import scala.annotation.unchecked.uncheckedVariance import scala.concurrent.Promise -import scala.language.postfixOps /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/ReactiveStreamsCompliance.scala b/akka-stream/src/main/scala/akka/stream/impl/ReactiveStreamsCompliance.scala index fb26f1dc86..b89f48d63e 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/ReactiveStreamsCompliance.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/ReactiveStreamsCompliance.scala @@ -4,7 +4,7 @@ package akka.stream.impl import scala.util.control.NonFatal -import org.reactivestreams.{ Subscriber, Publisher, Subscription } +import org.reactivestreams.{ Subscriber, Subscription } /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/SinkholeSubscriber.scala b/akka-stream/src/main/scala/akka/stream/impl/SinkholeSubscriber.scala index 999f50c470..d5642fb7b9 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/SinkholeSubscriber.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/SinkholeSubscriber.scala @@ -3,7 +3,6 @@ */ package akka.stream.impl -import java.util.concurrent.atomic.AtomicReference import akka.Done import scala.concurrent.Promise diff --git a/akka-stream/src/main/scala/akka/stream/impl/Sinks.scala b/akka-stream/src/main/scala/akka/stream/impl/Sinks.scala index 9ff8c41d50..f7fdac95d7 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/Sinks.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/Sinks.scala @@ -3,7 +3,6 @@ */ package akka.stream.impl -import java.util.concurrent.atomic.AtomicReference import akka.{ Done, NotUsed } import akka.actor.{ ActorRef, Props } import akka.stream.Attributes.InputBuffer @@ -15,7 +14,6 @@ import org.reactivestreams.{ Publisher, Subscriber } import scala.annotation.unchecked.uncheckedVariance import scala.collection.immutable import scala.concurrent.{ Future, Promise } -import scala.language.postfixOps import scala.util.{ Failure, Success, Try } import akka.stream.scaladsl.SinkQueue import java.util.concurrent.CompletionStage diff --git a/akka-stream/src/main/scala/akka/stream/impl/Stages.scala b/akka-stream/src/main/scala/akka/stream/impl/Stages.scala index 5ca004d76e..89f8241096 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/Stages.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/Stages.scala @@ -9,7 +9,6 @@ import akka.stream.Attributes._ import akka.stream.Supervision.Decider import akka.stream._ import akka.stream.impl.StreamLayout._ -import akka.stream.scaladsl.Source import akka.stream.stage.AbstractStage.PushPullGraphStage import akka.stream.stage.Stage import org.reactivestreams.Processor diff --git a/akka-stream/src/main/scala/akka/stream/impl/StreamLayout.scala b/akka-stream/src/main/scala/akka/stream/impl/StreamLayout.scala index 218bad1f27..3c4e5eaf4f 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/StreamLayout.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/StreamLayout.scala @@ -3,7 +3,7 @@ */ package akka.stream.impl -import java.util.concurrent.atomic.{ AtomicInteger, AtomicReference } +import java.util.concurrent.atomic.{ AtomicReference } import java.{ util ⇒ ju } import akka.NotUsed import akka.stream.impl.MaterializerSession.MaterializationPanic diff --git a/akka-stream/src/main/scala/akka/stream/impl/SubscriberManagement.scala b/akka-stream/src/main/scala/akka/stream/impl/SubscriberManagement.scala index 59b6b6466b..478c60d005 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/SubscriberManagement.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/SubscriberManagement.scala @@ -3,11 +3,9 @@ */ package akka.stream.impl -import scala.annotation.switch import scala.annotation.tailrec import org.reactivestreams.{ Subscriber, Subscription } import SubscriberManagement.ShutDown -import ResizableMultiReaderRingBuffer.NothingToReadException /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/Transfer.scala b/akka-stream/src/main/scala/akka/stream/impl/Transfer.scala index 8b503bd949..2d6b8a2951 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/Transfer.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/Transfer.scala @@ -4,7 +4,7 @@ package akka.stream.impl import scala.util.control.NonFatal -import akka.actor.{ Actor, ActorRefFactory } +import akka.actor.{ Actor } /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/fusing/ActorGraphInterpreter.scala b/akka-stream/src/main/scala/akka/stream/impl/fusing/ActorGraphInterpreter.scala index 6d66f1579e..61f6170767 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/fusing/ActorGraphInterpreter.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/fusing/ActorGraphInterpreter.scala @@ -15,7 +15,6 @@ import akka.stream.stage.{ GraphStageLogic, InHandler, OutHandler } import org.reactivestreams.{ Subscriber, Subscription } import scala.concurrent.forkjoin.ThreadLocalRandom import scala.util.control.NonFatal -import akka.event.LoggingAdapter import akka.stream.impl.ActorMaterializerImpl import akka.stream.impl.SubFusingActorMaterializerImpl import scala.annotation.tailrec diff --git a/akka-stream/src/main/scala/akka/stream/impl/fusing/IteratorInterpreter.scala b/akka-stream/src/main/scala/akka/stream/impl/fusing/IteratorInterpreter.scala index 76dc7c924d..32c7aee126 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/fusing/IteratorInterpreter.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/fusing/IteratorInterpreter.scala @@ -3,7 +3,7 @@ */ package akka.stream.impl.fusing -import akka.event.{ Logging, NoLogging } +import akka.event.{ NoLogging } import akka.stream._ import akka.stream.impl.fusing.GraphInterpreter.{ GraphAssembly, DownstreamBoundaryStageLogic, UpstreamBoundaryStageLogic } import akka.stream.stage.AbstractStage.PushPullGraphStage diff --git a/akka-stream/src/main/scala/akka/stream/impl/fusing/Ops.scala b/akka-stream/src/main/scala/akka/stream/impl/fusing/Ops.scala index 83420503fa..4dd67c4754 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/fusing/Ops.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/fusing/Ops.scala @@ -21,7 +21,6 @@ import scala.util.{ Failure, Success, Try } import akka.stream.ActorAttributes.SupervisionStrategy import scala.concurrent.duration.{ FiniteDuration, _ } import akka.stream.impl.Stages.DefaultAttributes -import akka.NotUsed /** * INTERNAL API @@ -1188,4 +1187,4 @@ private[stream] final class StatefulMapConcat[In, Out](f: () ⇒ In ⇒ immutabl } override def toString = "StatefulMapConcat" -} \ No newline at end of file +} diff --git a/akka-stream/src/main/scala/akka/stream/impl/fusing/StreamOfStreams.scala b/akka-stream/src/main/scala/akka/stream/impl/fusing/StreamOfStreams.scala index f0349f8851..8122ebb99b 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/fusing/StreamOfStreams.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/fusing/StreamOfStreams.scala @@ -8,17 +8,12 @@ import akka.NotUsed import akka.stream._ import akka.stream.impl.Stages.DefaultAttributes import akka.stream.impl.SubscriptionTimeoutException -import akka.stream.impl.fusing.GraphStages.SimpleLinearGraphStage import akka.stream.stage._ import akka.stream.scaladsl._ import akka.stream.actor.ActorSubscriberMessage -import akka.stream.actor.ActorPublisherMessage -import java.{ util ⇒ ju } import scala.collection.immutable -import scala.concurrent._ import scala.concurrent.duration.FiniteDuration import scala.util.control.NonFatal -import akka.stream.impl.MultiStreamOutputProcessor.SubstreamSubscriptionTimeout import scala.annotation.tailrec import akka.stream.impl.PublisherSource import akka.stream.impl.CancellingSubscriber diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/InputStreamPublisher.scala b/akka-stream/src/main/scala/akka/stream/impl/io/InputStreamPublisher.scala index 7d7984eb88..5cca525b33 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/InputStreamPublisher.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/InputStreamPublisher.scala @@ -7,13 +7,10 @@ import java.io.InputStream import akka.Done import akka.actor.{ Deploy, ActorLogging, DeadLetterSuppression, Props } -import akka.io.DirectByteBufferPool import akka.stream.actor.ActorPublisherMessage import akka.stream.IOResult import akka.util.ByteString -import akka.util.ByteString.ByteString1C -import scala.annotation.tailrec import scala.concurrent.Promise import scala.util.{ Failure, Success } diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/TcpStages.scala b/akka-stream/src/main/scala/akka/stream/impl/io/TcpStages.scala index dec1401c40..48b2b288b0 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/TcpStages.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/TcpStages.scala @@ -16,7 +16,6 @@ import akka.stream.impl.ReactiveStreamsCompliance import akka.stream.impl.fusing.GraphStages.detacher import akka.stream.scaladsl.Tcp.{ OutgoingConnection, ServerBinding } import akka.stream.scaladsl.{ BidiFlow, Flow, Tcp ⇒ StreamTcp } -import akka.stream.stage.GraphStageLogic.StageActor import akka.stream.stage._ import akka.util.ByteString diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/FileIO.scala b/akka-stream/src/main/scala/akka/stream/javadsl/FileIO.scala index 8f97271d9a..359f7cdd7f 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/FileIO.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/FileIO.scala @@ -5,9 +5,8 @@ package akka.stream.javadsl import java.io.File import java.nio.file.StandardOpenOption -import java.nio.file.StandardOpenOption._ import java.util -import akka.stream.{ scaladsl, javadsl, ActorAttributes } +import akka.stream.{ scaladsl, javadsl } import akka.stream.IOResult import akka.util.ByteString import java.util.concurrent.CompletionStage diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala index 60802aab70..e1ca98ffd5 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala @@ -3,17 +3,14 @@ */ package akka.stream.javadsl -import akka.stream.impl.fusing.RecoverWith import akka.{ NotUsed, Done } import akka.event.LoggingAdapter import akka.japi.{ function, Pair } -import akka.stream.impl.Timers.{ DelayInitial, IdleInject } import akka.stream.impl.{ ConstantFun, StreamLayout } import akka.stream.{ scaladsl, _ } import akka.stream.stage.Stage import org.reactivestreams.Processor import scala.annotation.unchecked.uncheckedVariance -import scala.collection.immutable import scala.concurrent.duration.FiniteDuration import akka.japi.Util import java.util.Comparator diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Framing.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Framing.scala index 40d159f5d7..c3002bfc09 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Framing.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Framing.scala @@ -7,7 +7,6 @@ import java.nio.ByteOrder import akka.NotUsed import akka.stream.scaladsl -import akka.stream.stage._ import akka.util.ByteString object Framing { diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala index 8bc80dc91e..8afcee3fc9 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala @@ -3,19 +3,15 @@ */ package akka.stream.javadsl -import java.io.{ OutputStream, InputStream, File } import java.util import java.util.Optional import akka.{ Done, NotUsed } import akka.actor.{ ActorRef, Cancellable, Props } import akka.event.LoggingAdapter import akka.japi.{ Pair, Util, function } -import akka.stream.Attributes._ import akka.stream._ -import akka.stream.impl.fusing.{ GraphStages, Delay } import akka.stream.impl.{ ConstantFun, StreamLayout } import akka.stream.stage.Stage -import akka.util.ByteString import org.reactivestreams.{ Publisher, Subscriber } import scala.annotation.unchecked.uncheckedVariance import scala.collection.JavaConverters._ @@ -23,7 +19,6 @@ import scala.collection.immutable import scala.collection.immutable.Range.Inclusive import scala.concurrent.duration.FiniteDuration import scala.concurrent.{ Future, Promise } -import scala.language.{ higherKinds, implicitConversions } import scala.compat.java8.OptionConverters._ import java.util.concurrent.CompletionStage import java.util.concurrent.CompletableFuture diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/StreamConverters.scala b/akka-stream/src/main/scala/akka/stream/javadsl/StreamConverters.scala index 5be3db3956..d8b76df8dd 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/StreamConverters.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/StreamConverters.scala @@ -5,7 +5,7 @@ package akka.stream.javadsl import java.io.{ InputStream, OutputStream } import akka.japi.function -import akka.stream.{ scaladsl, javadsl, ActorAttributes } +import akka.stream.{ scaladsl, javadsl } import akka.stream.IOResult import akka.util.ByteString import scala.concurrent.duration.FiniteDuration diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/SubFlow.scala b/akka-stream/src/main/scala/akka/stream/javadsl/SubFlow.scala index 5542c3148e..3ee680a20f 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/SubFlow.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/SubFlow.scala @@ -7,10 +7,8 @@ import akka.NotUsed import akka.event.LoggingAdapter import akka.japi.function import akka.stream._ -import akka.stream.impl.Stages.StageModule import akka.stream.impl.ConstantFun import akka.stream.stage.Stage -import scala.collection.immutable import scala.collection.JavaConverters._ import scala.annotation.unchecked.uncheckedVariance import scala.concurrent.duration.FiniteDuration diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/SubSource.scala b/akka-stream/src/main/scala/akka/stream/javadsl/SubSource.scala index beda916330..e966b9a764 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/SubSource.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/SubSource.scala @@ -7,10 +7,8 @@ import akka.NotUsed import akka.event.LoggingAdapter import akka.japi.function import akka.stream._ -import akka.stream.impl.Stages.StageModule import akka.stream.impl.ConstantFun import akka.stream.stage.Stage -import scala.collection.immutable import scala.collection.JavaConverters._ import scala.annotation.unchecked.uncheckedVariance import scala.concurrent.duration.FiniteDuration diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/TLS.scala b/akka-stream/src/main/scala/akka/stream/javadsl/TLS.scala index a0d930cd3d..866ad396cd 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/TLS.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/TLS.scala @@ -1,7 +1,7 @@ package akka.stream.javadsl import java.util.Optional -import javax.net.ssl.{ SSLContext, SSLParameters } +import javax.net.ssl.{ SSLContext } import akka.{ japi, NotUsed } import akka.stream._ @@ -98,4 +98,4 @@ object TLSPlacebo { private val forJava: javadsl.BidiFlow[SslTlsOutbound, ByteString, ByteString, SessionBytes, NotUsed] = new javadsl.BidiFlow(scaladsl.TLSPlacebo()) -} \ No newline at end of file +} diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Tcp.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Tcp.scala index 7756c56b59..d05c4a8da0 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Tcp.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Tcp.scala @@ -6,10 +6,8 @@ package akka.stream.javadsl import java.lang.{ Iterable ⇒ JIterable } import java.util.Optional import akka.NotUsed -import scala.collection.immutable import scala.concurrent.duration._ import java.net.InetSocketAddress -import scala.util.control.NoStackTrace import akka.actor.ActorSystem import akka.actor.ExtendedActorSystem import akka.actor.ExtensionId diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/FileIO.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/FileIO.scala index 40f2cced9b..3428ea575f 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/FileIO.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/FileIO.scala @@ -7,7 +7,6 @@ import java.io.File import java.nio.file.StandardOpenOption import java.nio.file.StandardOpenOption._ -import akka.stream.ActorAttributes import akka.stream.impl.Stages.DefaultAttributes import akka.stream.impl.io._ import akka.stream.IOResult diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala index 0393fcb7b4..595aa5c723 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala @@ -4,13 +4,11 @@ package akka.stream.scaladsl import akka.event.LoggingAdapter -import akka.stream.Attributes._ import akka.stream._ import akka.Done import akka.stream.impl.Stages.{ DirectProcessor, StageModule } -import akka.stream.impl.StreamLayout.{ EmptyModule, Module } +import akka.stream.impl.StreamLayout.{ Module } import akka.stream.impl._ -import akka.stream.impl.fusing.GraphStages.TerminationWatcher import akka.stream.impl.fusing._ import akka.stream.stage.AbstractStage.{ PushPullGraphStage, PushPullGraphStageWithMaterializedValue } import akka.stream.stage._ @@ -18,7 +16,7 @@ import org.reactivestreams.{ Processor, Publisher, Subscriber, Subscription } import scala.annotation.unchecked.uncheckedVariance import scala.collection.immutable import scala.concurrent.Future -import scala.concurrent.duration.{ Duration, FiniteDuration } +import scala.concurrent.duration.{ FiniteDuration } import scala.language.higherKinds import akka.stream.impl.fusing.FlattenMerge diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Graph.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Graph.scala index 29a42e5408..aa478f4551 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Graph.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Graph.scala @@ -8,7 +8,7 @@ import akka.stream._ import akka.stream.impl._ import akka.stream.impl.fusing.GraphStages import akka.stream.impl.fusing.GraphStages.MaterializedValueSource -import akka.stream.impl.Stages.{ DefaultAttributes, StageModule, SymbolicStage } +import akka.stream.impl.Stages.{ DefaultAttributes, StageModule} import akka.stream.impl.StreamLayout._ import akka.stream.scaladsl.Partition.PartitionOutOfBoundsException import akka.stream.stage.{ OutHandler, InHandler, GraphStageLogic, GraphStage } diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Sink.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Sink.scala index ef70d5eae9..f480cbe518 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Sink.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Sink.scala @@ -3,7 +3,6 @@ */ package akka.stream.scaladsl -import java.io.{ InputStream, OutputStream, File } import akka.{ Done, NotUsed } import akka.dispatch.ExecutionContexts import akka.actor.{ Status, ActorRef, Props } @@ -11,14 +10,11 @@ import akka.stream.actor.ActorSubscriber import akka.stream.impl.Stages.DefaultAttributes import akka.stream.impl.StreamLayout.Module import akka.stream.impl._ -import akka.stream.impl.io.{ InputStreamSinkStage, OutputStreamSink, FileSink } import akka.stream.stage.{ Context, PushStage, SyncDirective, TerminationDirective } import akka.stream.{ javadsl, _ } -import akka.util.ByteString import org.reactivestreams.{ Publisher, Subscriber } import scala.annotation.tailrec import scala.collection.immutable -import scala.concurrent.duration.{ FiniteDuration, _ } import scala.concurrent.{ ExecutionContext, Future } import scala.util.{ Failure, Success, Try } diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala index 20399eb227..fcdcae35dc 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala @@ -3,7 +3,6 @@ */ package akka.stream.scaladsl -import java.io.{ OutputStream, InputStream, File } import akka.{ Done, NotUsed } import akka.actor.{ ActorRef, Cancellable, Props } import akka.stream.actor.ActorPublisher @@ -11,18 +10,14 @@ import akka.stream.impl.Stages.{ DefaultAttributes, StageModule } import akka.stream.impl.StreamLayout.Module import akka.stream.impl.fusing.GraphStages import akka.stream.impl.fusing.GraphStages._ -import akka.stream.impl.io.{ OutputStreamSourceStage, InputStreamSource, FileSource } import akka.stream.impl.{ EmptyPublisher, ErrorPublisher, _ } import akka.stream.{ Outlet, SourceShape, _ } -import akka.util.ByteString import org.reactivestreams.{ Publisher, Subscriber } import scala.annotation.tailrec import scala.annotation.unchecked.uncheckedVariance -import scala.language.higherKinds import scala.collection.immutable -import scala.concurrent.duration.{ FiniteDuration, _ } +import scala.concurrent.duration.{ FiniteDuration } import scala.concurrent.{ Future, Promise } -import akka.stream.impl.fusing.Buffer import java.util.concurrent.CompletionStage import scala.compat.java8.FutureConverters._ diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/StreamConverters.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/StreamConverters.scala index 6fb7cc90e2..a8cfd9e779 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/StreamConverters.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/StreamConverters.scala @@ -5,7 +5,6 @@ package akka.stream.scaladsl import java.io.{ OutputStream, InputStream } -import akka.stream.ActorAttributes import akka.stream.IOResult import akka.stream.impl.Stages.DefaultAttributes import akka.stream.impl.io.{ InputStreamSinkStage, OutputStreamSink, OutputStreamSourceStage, InputStreamSource } diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/SubFlow.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/SubFlow.scala index 7fc68743ae..a5e9054828 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/SubFlow.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/SubFlow.scala @@ -4,7 +4,6 @@ package akka.stream.scaladsl import akka.stream._ -import akka.stream.impl.Stages.StageModule import language.higherKinds import scala.annotation.unchecked.uncheckedVariance diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/TLS.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/TLS.scala index ad97abd18b..defbf43e51 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/TLS.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/TLS.scala @@ -1,6 +1,6 @@ package akka.stream.scaladsl -import javax.net.ssl.{ SSLContext, SSLParameters } +import javax.net.ssl.{ SSLContext } import akka.stream.impl.io.TlsModule import akka.NotUsed @@ -134,4 +134,4 @@ object ScalaSessionAPI { new ScalaSessionAPI { def session: SSLSession = _session } -} \ No newline at end of file +} diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/package.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/package.scala index 0fb6a4331c..8381920d9e 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/package.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/package.scala @@ -6,7 +6,6 @@ package akka.stream import java.util.concurrent.CompletionStage import scala.concurrent.Future import scala.compat.java8.FutureConverters -import akka.japi.function /** * Scala API: The flow DSL allows the formulation of stream transformations based on some diff --git a/akka-stream/src/main/scala/akka/stream/stage/GraphStage.scala b/akka-stream/src/main/scala/akka/stream/stage/GraphStage.scala index 0508b6475a..496a9a758b 100644 --- a/akka-stream/src/main/scala/akka/stream/stage/GraphStage.scala +++ b/akka-stream/src/main/scala/akka/stream/stage/GraphStage.scala @@ -3,23 +3,18 @@ */ package akka.stream.stage -import java.util.concurrent.atomic.{ AtomicReferenceFieldUpdater, AtomicReference } +import java.util.concurrent.atomic.{ AtomicReference } import akka.NotUsed import java.util.concurrent.locks.ReentrantLock import akka.actor._ -import akka.dispatch.sysmsg.{ DeathWatchNotification, SystemMessage, Unwatch, Watch } -import akka.event.LoggingAdapter import akka.japi.function.{ Effect, Procedure } import akka.stream._ import akka.stream.impl.StreamLayout.Module import akka.stream.impl.fusing.{ GraphInterpreter, GraphStageModule, SubSource, SubSink } -import akka.stream.impl.{ ReactiveStreamsCompliance, SeqActorName } -import scala.annotation.tailrec -import scala.collection.mutable.ArrayBuffer +import akka.stream.impl.{ ReactiveStreamsCompliance} import scala.collection.{ immutable, mutable } import scala.concurrent.duration.FiniteDuration import akka.stream.actor.ActorSubscriberMessage -import akka.stream.actor.ActorPublisherMessage abstract class GraphStageWithMaterializedValue[+S <: Shape, +M] extends Graph[S, M] { @@ -1322,4 +1317,4 @@ private[akka] trait CallbackWrapper[T] extends AsyncCallback[T] { lock.lock() try body finally if (lock.isLocked) lock.unlock() } -} \ No newline at end of file +} diff --git a/akka-stream/src/main/scala/akka/stream/stage/Stage.scala b/akka-stream/src/main/scala/akka/stream/stage/Stage.scala index 6d759cc686..4a2983bba0 100644 --- a/akka-stream/src/main/scala/akka/stream/stage/Stage.scala +++ b/akka-stream/src/main/scala/akka/stream/stage/Stage.scala @@ -6,7 +6,6 @@ package akka.stream.stage import akka.NotUsed import akka.stream._ -import scala.annotation.unchecked.uncheckedVariance import scala.util.control.NonFatal /** diff --git a/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala b/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala index cca077dfa3..a27a795d55 100644 --- a/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala +++ b/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala @@ -128,7 +128,6 @@ object CallingThreadDispatcher { */ class CallingThreadDispatcher(_configurator: MessageDispatcherConfigurator) extends MessageDispatcher(_configurator) { import CallingThreadDispatcher._ - import configurator.prerequisites._ val log = akka.event.Logging(eventStream, getClass.getName) diff --git a/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala b/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala index 58fa7411e7..9e5b441385 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala @@ -8,7 +8,7 @@ import scala.util.matching.Regex import scala.collection.immutable import scala.concurrent.duration.Duration import scala.reflect.ClassTag -import akka.actor.{ DeadLetter, ActorSystem, Terminated, UnhandledMessage } +import akka.actor.{ DeadLetter, ActorSystem, UnhandledMessage } import akka.dispatch.sysmsg.{ SystemMessage, Terminate } import akka.event.Logging.{ Warning, LogEvent, InitializeLogger, Info, Error, Debug, LoggerInitialized } import akka.event.Logging diff --git a/akka-testkit/src/main/scala/akka/testkit/TestFSMRef.scala b/akka-testkit/src/main/scala/akka/testkit/TestFSMRef.scala index 397d813a98..36be493c82 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestFSMRef.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestFSMRef.scala @@ -5,11 +5,7 @@ package akka.testkit import akka.actor._ -import scala.concurrent.duration.Duration -import akka.dispatch.DispatcherPrerequisites import scala.concurrent.duration.FiniteDuration -import akka.dispatch.MessageDispatcher -import akka.dispatch.MailboxType import scala.reflect.ClassTag /** diff --git a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala index 1f96b08aec..a6fcc2fc39 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala @@ -4,7 +4,7 @@ package akka.testkit import language.postfixOps -import scala.annotation.{ varargs, tailrec } +import scala.annotation.{ tailrec } import scala.collection.immutable import scala.concurrent.Await import scala.concurrent.duration._ @@ -12,7 +12,6 @@ import scala.reflect.ClassTag import java.util.concurrent._ import java.util.concurrent.atomic.AtomicInteger import akka.actor._ -import akka.actor.Actor._ import akka.util.{ Timeout, BoxedType } import scala.util.control.NonFatal import scala.Some diff --git a/akka-testkit/src/main/scala/akka/testkit/TestLatch.scala b/akka-testkit/src/main/scala/akka/testkit/TestLatch.scala index b731768b5c..7aff88905e 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestLatch.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestLatch.scala @@ -6,7 +6,7 @@ package akka.testkit import scala.concurrent.duration.Duration import akka.actor.ActorSystem -import scala.concurrent.{ Await, CanAwait, Awaitable } +import scala.concurrent.{ CanAwait, Awaitable } import java.util.concurrent.{ TimeoutException, CountDownLatch, TimeUnit } import scala.concurrent.duration.FiniteDuration diff --git a/akka-testkit/src/main/scala/akka/testkit/package.scala b/akka-testkit/src/main/scala/akka/testkit/package.scala index 3e1ffcd742..46bd5ea61f 100644 --- a/akka-testkit/src/main/scala/akka/testkit/package.scala +++ b/akka-testkit/src/main/scala/akka/testkit/package.scala @@ -3,7 +3,6 @@ */ package akka -import language.implicitConversions import akka.actor.ActorSystem import scala.concurrent.duration.{ Duration, FiniteDuration } diff --git a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala index ba90604a87..7892f11a2b 100644 --- a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala @@ -5,7 +5,7 @@ package akka.testkit import org.scalactic.Constraint -import language.{ postfixOps, reflectiveCalls } +import language.{ postfixOps } import org.scalatest.{ WordSpecLike, BeforeAndAfterAll } import org.scalatest.Matchers import akka.actor.ActorSystem diff --git a/akka-testkit/src/test/scala/akka/testkit/AkkaSpecSpec.scala b/akka-testkit/src/test/scala/akka/testkit/AkkaSpecSpec.scala index a60753e98c..e470d7c754 100644 --- a/akka-testkit/src/test/scala/akka/testkit/AkkaSpecSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/AkkaSpecSpec.scala @@ -3,7 +3,6 @@ */ package akka.testkit -import language.reflectiveCalls import language.postfixOps import org.scalatest.WordSpec diff --git a/akka-testkit/src/test/scala/akka/testkit/Coroner.scala b/akka-testkit/src/test/scala/akka/testkit/Coroner.scala index d7ce564eba..9edabd8d16 100644 --- a/akka-testkit/src/test/scala/akka/testkit/Coroner.scala +++ b/akka-testkit/src/test/scala/akka/testkit/Coroner.scala @@ -7,8 +7,6 @@ import java.io.PrintStream import java.lang.management.{ ManagementFactory, ThreadInfo } import java.util.Date import java.util.concurrent.{ TimeoutException, CountDownLatch } -import org.scalatest.{ BeforeAndAfterAll, Suite } -import scala.annotation.tailrec import scala.concurrent.{ Promise, Awaitable, CanAwait, Await } import scala.concurrent.duration._ import scala.util.control.NonFatal @@ -267,4 +265,4 @@ trait WatchedByCoroner { def displayThreadCounts: Boolean = true def startAndStopDuration: FiniteDuration = Coroner.defaultStartAndStopDuration -} \ No newline at end of file +} diff --git a/akka-testkit/src/test/scala/akka/testkit/JavaTestKitSpec.scala b/akka-testkit/src/test/scala/akka/testkit/JavaTestKitSpec.scala index a988c94c4d..73831ad710 100644 --- a/akka-testkit/src/test/scala/akka/testkit/JavaTestKitSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/JavaTestKitSpec.scala @@ -2,13 +2,8 @@ package akka.testkit import language.postfixOps -import org.scalatest.WordSpec -import org.scalatest.Matchers -import org.scalatest.{ BeforeAndAfterEach, WordSpec } import akka.actor._ -import scala.concurrent.{ Future, Await } import scala.concurrent.duration._ -import akka.pattern.ask @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class JavaTestKitSpec extends AkkaSpec with DefaultTimeout { diff --git a/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala b/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala index 9140bfd9f0..b35baf04cd 100644 --- a/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala @@ -3,14 +3,12 @@ */ package akka.testkit -import language.{ postfixOps, reflectiveCalls } -import org.scalatest.Matchers -import org.scalatest.{ BeforeAndAfterEach, WordSpec } +import language.{ postfixOps } +import org.scalatest.{ BeforeAndAfterEach } import akka.actor._ import akka.event.Logging.Warning -import scala.concurrent.{ Future, Promise, Await } +import scala.concurrent.{ Promise, Await } import scala.concurrent.duration._ -import akka.actor.ActorSystem import akka.pattern.ask import akka.dispatch.Dispatcher diff --git a/akka-testkit/src/test/scala/akka/testkit/TestFSMRefSpec.scala b/akka-testkit/src/test/scala/akka/testkit/TestFSMRefSpec.scala index 8bfd0e00fa..6be18bf166 100644 --- a/akka-testkit/src/test/scala/akka/testkit/TestFSMRefSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/TestFSMRefSpec.scala @@ -6,8 +6,6 @@ package akka.testkit import language.postfixOps -import org.scalatest.Matchers -import org.scalatest.{ BeforeAndAfterEach, WordSpec } import akka.actor._ import scala.concurrent.duration._ diff --git a/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitOps.scala b/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitOps.scala index 9cad285093..016e864cea 100644 --- a/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitOps.scala +++ b/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitOps.scala @@ -3,7 +3,6 @@ */ package akka.testkit.metrics -import com.codahale.metrics import com.codahale.metrics._ import java.util import com.codahale.metrics.jvm diff --git a/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitSpec.scala b/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitSpec.scala index 95e3a4d506..2522aa04dd 100644 --- a/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitSpec.scala @@ -5,8 +5,6 @@ package akka.testkit.metrics import org.scalatest._ import com.typesafe.config.ConfigFactory -import scala.util.Random -import org.scalautils.Tolerance class MetricsKitSpec extends WordSpec with Matchers with BeforeAndAfter with BeforeAndAfterAll with MetricsKit { diff --git a/akka-typed/src/main/scala/akka/typed/ActorContext.scala b/akka-typed/src/main/scala/akka/typed/ActorContext.scala index 386eda218b..459240729b 100644 --- a/akka-typed/src/main/scala/akka/typed/ActorContext.scala +++ b/akka-typed/src/main/scala/akka/typed/ActorContext.scala @@ -4,18 +4,11 @@ package akka.typed import scala.concurrent.duration.Duration -import scala.collection.immutable -import scala.collection.immutable.TreeSet import scala.collection.immutable.TreeMap import akka.util.Helpers import akka.{ actor ⇒ untyped } -import scala.reflect.ClassTag -import scala.reflect.classTag -import java.util.concurrent.ConcurrentLinkedQueue -import scala.annotation.tailrec import scala.concurrent.duration.FiniteDuration import scala.concurrent.ExecutionContextExecutor -import akka.typed.Behavior.stoppedBehavior /** * An Actor is given by the combination of a [[Behavior]] and a context in diff --git a/akka-typed/src/main/scala/akka/typed/ActorSystem.scala b/akka-typed/src/main/scala/akka/typed/ActorSystem.scala index c8bf860712..0357243743 100644 --- a/akka-typed/src/main/scala/akka/typed/ActorSystem.scala +++ b/akka-typed/src/main/scala/akka/typed/ActorSystem.scala @@ -4,12 +4,7 @@ package akka.typed import akka.event.EventStream -import akka.actor.Scheduler import scala.concurrent.ExecutionContext -import java.util.concurrent.Executor -import scala.concurrent.duration.Duration -import akka.actor.Extension -import akka.actor.ExtensionId import akka.actor.ActorRefProvider import java.util.concurrent.ThreadFactory import akka.actor.DynamicAccess diff --git a/akka-typed/src/main/scala/akka/typed/Ask.scala b/akka-typed/src/main/scala/akka/typed/Ask.scala index d0b2b69b6a..458410de70 100644 --- a/akka-typed/src/main/scala/akka/typed/Ask.scala +++ b/akka-typed/src/main/scala/akka/typed/Ask.scala @@ -9,10 +9,6 @@ import akka.actor.InternalActorRef import akka.pattern.AskTimeoutException import akka.pattern.PromiseActorRef import java.lang.IllegalArgumentException -import scala.util.Success -import scala.concurrent.ExecutionContext -import scala.util.Failure -import akka.actor.Status /** * The ask-pattern implements the initiator side of a request–reply protocol. diff --git a/akka-typed/src/main/scala/akka/typed/Behavior.scala b/akka-typed/src/main/scala/akka/typed/Behavior.scala index ff11576dad..b68f3eee7a 100644 --- a/akka-typed/src/main/scala/akka/typed/Behavior.scala +++ b/akka-typed/src/main/scala/akka/typed/Behavior.scala @@ -3,12 +3,6 @@ */ package akka.typed -import scala.concurrent.duration.FiniteDuration -import scala.reflect.ClassTag -import akka.actor.OneForOneStrategy -import scala.annotation.tailrec -import scala.collection.immutable -import akka.util.LineNumbers /** * The behavior of an actor defines how it reacts to the messages that it diff --git a/akka-typed/src/main/scala/akka/typed/Inbox.scala b/akka-typed/src/main/scala/akka/typed/Inbox.scala index 9620207aa6..b8e9c5bc76 100644 --- a/akka-typed/src/main/scala/akka/typed/Inbox.scala +++ b/akka-typed/src/main/scala/akka/typed/Inbox.scala @@ -3,27 +3,13 @@ */ package akka.typed -import java.util.concurrent.TimeoutException -import java.util.concurrent.atomic.AtomicInteger -import scala.collection.immutable.TreeSet -import scala.collection.mutable.Queue -import scala.concurrent.Await -import scala.concurrent.duration.{ Deadline, Duration, DurationInt, FiniteDuration } -import akka.{ actor ⇒ a } -import akka.pattern.ask -import akka.util.Helpers.ConfigOps -import akka.util.Timeout -import scala.concurrent.Future -import akka.actor.MinimalActorRef import java.util.concurrent.ConcurrentLinkedQueue import akka.actor.ActorPath import akka.actor.RootActorPath import akka.actor.Address -import scala.reflect.ClassTag import scala.collection.immutable import scala.annotation.tailrec import akka.actor.ActorRefProvider -import scala.concurrent.ExecutionContext object Inbox { diff --git a/akka-typed/src/test/scala/akka/typed/PerformanceSpec.scala b/akka-typed/src/test/scala/akka/typed/PerformanceSpec.scala index 72223766a4..3878dada75 100644 --- a/akka-typed/src/test/scala/akka/typed/PerformanceSpec.scala +++ b/akka-typed/src/test/scala/akka/typed/PerformanceSpec.scala @@ -4,12 +4,7 @@ package akka.typed import ScalaDSL._ -import Ops._ -import AskPattern._ -import StepWise._ import scala.concurrent.duration._ -import scala.concurrent.Await -import scala.concurrent.Future import com.typesafe.config.ConfigFactory class PerformanceSpec extends TypedSpec( @@ -28,7 +23,6 @@ class PerformanceSpec extends TypedSpec( def behavior(pairs: Int, pings: Int, count: Int, executor: String) = StepWise[Pong] { (ctx, startWith) ⇒ startWith { - import ctx.executionContext val pinger = Props(SelfAware[Ping](self ⇒ Static { msg ⇒ if (msg.x == 0) { diff --git a/akka-typed/src/test/scala/akka/typed/StepWise.scala b/akka-typed/src/test/scala/akka/typed/StepWise.scala index f357419c42..91074a38f6 100644 --- a/akka-typed/src/test/scala/akka/typed/StepWise.scala +++ b/akka-typed/src/test/scala/akka/typed/StepWise.scala @@ -4,10 +4,8 @@ package akka.typed import scala.concurrent.duration.FiniteDuration -import scala.annotation.tailrec import java.util.concurrent.TimeoutException import scala.concurrent.duration.Deadline -import scala.util.control.NonFatal /** * This object contains tools for building step-wise behaviors for formulating @@ -37,7 +35,6 @@ import scala.util.control.NonFatal */ @deprecated("to be replaced by process DSL", "2.4-M2") object StepWise { - import Behavior._ import ScalaDSL._ sealed trait AST @@ -175,4 +172,4 @@ object StepWise { } } -abstract class StepWise \ No newline at end of file +abstract class StepWise diff --git a/akka-typed/src/test/scala/akka/typed/patterns/ReceiverSpec.scala b/akka-typed/src/test/scala/akka/typed/patterns/ReceiverSpec.scala index c4c74c8476..94900b692b 100644 --- a/akka-typed/src/test/scala/akka/typed/patterns/ReceiverSpec.scala +++ b/akka-typed/src/test/scala/akka/typed/patterns/ReceiverSpec.scala @@ -3,7 +3,6 @@ package akka.typed.patterns import akka.typed._ import scala.concurrent.duration._ import akka.typed.Effect.{ ReceiveTimeoutSet, Scheduled } -import scala.util.control.NonFatal import Receiver._ object ReceiverSpec { @@ -246,4 +245,4 @@ class ReceiverSpec extends TypedSpec { } } -} \ No newline at end of file +} diff --git a/akka-typed/src/test/scala/akka/typed/patterns/ReceptionistSpec.scala b/akka-typed/src/test/scala/akka/typed/patterns/ReceptionistSpec.scala index 3ab0df2e08..ce74796433 100644 --- a/akka-typed/src/test/scala/akka/typed/patterns/ReceptionistSpec.scala +++ b/akka-typed/src/test/scala/akka/typed/patterns/ReceptionistSpec.scala @@ -6,7 +6,6 @@ package akka.typed.patterns import Receptionist._ import akka.typed.ScalaDSL._ import akka.typed.AskPattern._ -import scala.concurrent.Future import scala.concurrent.duration._ import akka.typed._