From f7a45c0e8f58fbe59e0543cec9e80cc260b79af1 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Wed, 25 Jan 2012 15:38:04 +0100 Subject: [PATCH] Removing dead imports from akka-actor --- .../java/akka/dispatch/AbstractMessageDispatcher.java | 1 - akka-actor/src/main/scala/akka/actor/Actor.scala | 11 ----------- akka-actor/src/main/scala/akka/actor/ActorRef.scala | 5 +---- .../src/main/scala/akka/actor/ActorRefProvider.scala | 3 +-- .../src/main/scala/akka/actor/ActorSystem.scala | 2 -- akka-actor/src/main/scala/akka/actor/Deployer.scala | 5 ----- akka-actor/src/main/scala/akka/actor/FSM.scala | 1 - .../src/main/scala/akka/actor/FaultHandling.scala | 1 - akka-actor/src/main/scala/akka/actor/Locker.scala | 1 - akka-actor/src/main/scala/akka/actor/Props.scala | 1 - akka-actor/src/main/scala/akka/actor/Scheduler.scala | 2 +- akka-actor/src/main/scala/akka/actor/TypedActor.scala | 4 ++-- .../src/main/scala/akka/actor/UntypedActor.scala | 3 +-- .../scala/akka/dispatch/BalancingDispatcher.scala | 6 +----- .../src/main/scala/akka/dispatch/Dispatchers.scala | 3 --- akka-actor/src/main/scala/akka/dispatch/Future.scala | 11 ++++------- akka-actor/src/main/scala/akka/dispatch/Mailbox.scala | 1 - .../main/scala/akka/dispatch/PinnedDispatcher.scala | 5 ----- .../src/main/scala/akka/dispatch/PromiseStream.scala | 2 +- .../main/scala/akka/dispatch/ThreadPoolBuilder.scala | 2 +- .../src/main/scala/akka/dispatch/japi/Future.scala | 3 +-- .../main/scala/akka/routing/ConnectionManager.scala | 5 ----- akka-actor/src/main/scala/akka/routing/Routing.scala | 6 ++---- akka-actor/src/main/scala/akka/util/ByteString.scala | 6 +++--- akka-actor/src/main/scala/akka/util/Duration.scala | 3 +-- akka-actor/src/main/scala/akka/util/Helpers.scala | 1 - .../src/main/scala/akka/util/ReflectiveAccess.scala | 1 - 27 files changed, 20 insertions(+), 75 deletions(-) diff --git a/akka-actor/src/main/java/akka/dispatch/AbstractMessageDispatcher.java b/akka-actor/src/main/java/akka/dispatch/AbstractMessageDispatcher.java index 8248fd9e07..6720cf2b54 100644 --- a/akka-actor/src/main/java/akka/dispatch/AbstractMessageDispatcher.java +++ b/akka-actor/src/main/java/akka/dispatch/AbstractMessageDispatcher.java @@ -6,7 +6,6 @@ package akka.dispatch; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; abstract class AbstractMessageDispatcher { private volatile int _shutdownSchedule; // not initialized because this is faster: 0 == UNSCHEDULED diff --git a/akka-actor/src/main/scala/akka/actor/Actor.scala b/akka-actor/src/main/scala/akka/actor/Actor.scala index 7a1f640160..94aef4bdef 100644 --- a/akka-actor/src/main/scala/akka/actor/Actor.scala +++ b/akka-actor/src/main/scala/akka/actor/Actor.scala @@ -4,20 +4,9 @@ package akka.actor -import akka.dispatch._ -import akka.routing._ -import akka.util.Duration -import akka.japi.{ Creator, Procedure } -import akka.serialization.{ Serializer, Serialization } -import akka.event.Logging.Debug -import akka.event.LogSource -import akka.experimental import akka.AkkaException import scala.reflect.BeanProperty import scala.util.control.NoStackTrace -import com.eaio.uuid.UUID -import java.util.concurrent.TimeUnit -import java.util.{ Collection ⇒ JCollection } import java.util.regex.Pattern /** diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala index 5ccce6906c..fa6c9962e7 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala @@ -9,13 +9,10 @@ import akka.util._ import scala.collection.immutable.Stack import java.lang.{ UnsupportedOperationException, IllegalStateException } import akka.serialization.Serialization -import java.util.concurrent.TimeUnit import akka.event.EventStream -import akka.event.DeathWatch import scala.annotation.tailrec -import java.util.concurrent.{ ConcurrentHashMap, TimeoutException } +import java.util.concurrent.{ ConcurrentHashMap } import akka.event.LoggingAdapter -import java.util.concurrent.atomic.AtomicBoolean /** * Immutable and serializable handle to an actor, which may or may not reside diff --git a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala index 2ac45e90a9..a7e9a2163e 100755 --- a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala @@ -5,11 +5,10 @@ package akka.actor import java.util.concurrent.atomic.AtomicLong -import akka.config.ConfigurationException import akka.dispatch._ import akka.routing._ import akka.AkkaException -import akka.util.{ Duration, Switch, Helpers, Timeout } +import akka.util.{ Switch, Helpers } import akka.event._ /** diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala index c6842d0dc2..fc4a6f1f19 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala @@ -7,8 +7,6 @@ import akka.config.ConfigurationException import akka.event._ import akka.dispatch._ import akka.pattern.ask -import akka.util.duration._ -import akka.util.Timeout._ import org.jboss.netty.akka.util.HashedWheelTimer import java.util.concurrent.TimeUnit.MILLISECONDS import com.typesafe.config.Config diff --git a/akka-actor/src/main/scala/akka/actor/Deployer.scala b/akka-actor/src/main/scala/akka/actor/Deployer.scala index a13d3a8424..c8e780d5c2 100644 --- a/akka-actor/src/main/scala/akka/actor/Deployer.scala +++ b/akka-actor/src/main/scala/akka/actor/Deployer.scala @@ -4,12 +4,7 @@ package akka.actor -import collection.immutable.Seq -import akka.event.Logging -import akka.AkkaException -import akka.config.ConfigurationException import akka.util.Duration -import akka.event.EventStream import com.typesafe.config._ import akka.routing._ import java.util.concurrent.{ TimeUnit, ConcurrentHashMap } diff --git a/akka-actor/src/main/scala/akka/actor/FSM.scala b/akka-actor/src/main/scala/akka/actor/FSM.scala index eb7081899c..5660811c00 100644 --- a/akka-actor/src/main/scala/akka/actor/FSM.scala +++ b/akka-actor/src/main/scala/akka/actor/FSM.scala @@ -7,7 +7,6 @@ import akka.util._ import scala.collection.mutable import akka.event.Logging -import akka.util.Duration._ import akka.routing.{ Deafen, Listen, Listeners } object FSM { diff --git a/akka-actor/src/main/scala/akka/actor/FaultHandling.scala b/akka-actor/src/main/scala/akka/actor/FaultHandling.scala index 8d26567c37..71102ffb03 100644 --- a/akka-actor/src/main/scala/akka/actor/FaultHandling.scala +++ b/akka-actor/src/main/scala/akka/actor/FaultHandling.scala @@ -4,7 +4,6 @@ package akka.actor import java.util.concurrent.TimeUnit -import scala.annotation.tailrec import scala.collection.mutable.ArrayBuffer import scala.collection.JavaConversions._ import java.lang.{ Iterable ⇒ JIterable } diff --git a/akka-actor/src/main/scala/akka/actor/Locker.scala b/akka-actor/src/main/scala/akka/actor/Locker.scala index 9e34f02332..4f9caaeedc 100644 --- a/akka-actor/src/main/scala/akka/actor/Locker.scala +++ b/akka-actor/src/main/scala/akka/actor/Locker.scala @@ -5,7 +5,6 @@ package akka.actor import akka.dispatch._ import akka.util.Duration -import akka.util.duration._ import java.util.concurrent.ConcurrentHashMap import akka.event.DeathWatch diff --git a/akka-actor/src/main/scala/akka/actor/Props.scala b/akka-actor/src/main/scala/akka/actor/Props.scala index c0b84d0017..cd9a62abe7 100644 --- a/akka-actor/src/main/scala/akka/actor/Props.scala +++ b/akka-actor/src/main/scala/akka/actor/Props.scala @@ -6,7 +6,6 @@ package akka.actor import akka.dispatch._ import akka.japi.Creator -import akka.util._ import collection.immutable.Stack import akka.routing._ diff --git a/akka-actor/src/main/scala/akka/actor/Scheduler.scala b/akka-actor/src/main/scala/akka/actor/Scheduler.scala index a2451173b3..72d429b450 100644 --- a/akka-actor/src/main/scala/akka/actor/Scheduler.scala +++ b/akka-actor/src/main/scala/akka/actor/Scheduler.scala @@ -13,7 +13,7 @@ package akka.actor import akka.util.Duration -import org.jboss.netty.akka.util.{ Timer, TimerTask, HashedWheelTimer, Timeout ⇒ HWTimeout } +import org.jboss.netty.akka.util.{ TimerTask, HashedWheelTimer, Timeout ⇒ HWTimeout } import akka.event.LoggingAdapter import akka.dispatch.MessageDispatcher import java.io.Closeable diff --git a/akka-actor/src/main/scala/akka/actor/TypedActor.scala b/akka-actor/src/main/scala/akka/actor/TypedActor.scala index ce487ec2ef..69c8e44fc3 100644 --- a/akka-actor/src/main/scala/akka/actor/TypedActor.scala +++ b/akka-actor/src/main/scala/akka/actor/TypedActor.scala @@ -6,9 +6,9 @@ package akka.actor import akka.japi.{ Creator, Option ⇒ JOption } import java.lang.reflect.{ InvocationTargetException, Method, InvocationHandler, Proxy } -import akka.util.{ Duration, Timeout } +import akka.util.{ Timeout } import java.util.concurrent.atomic.{ AtomicReference ⇒ AtomVar } -import akka.serialization.{ Serializer, Serialization, SerializationExtension } +import akka.serialization.{ Serialization, SerializationExtension } import akka.dispatch._ import java.util.concurrent.TimeoutException import java.lang.IllegalStateException diff --git a/akka-actor/src/main/scala/akka/actor/UntypedActor.scala b/akka-actor/src/main/scala/akka/actor/UntypedActor.scala index d06896a10d..6dd4d8c2c5 100644 --- a/akka-actor/src/main/scala/akka/actor/UntypedActor.scala +++ b/akka-actor/src/main/scala/akka/actor/UntypedActor.scala @@ -4,8 +4,7 @@ package akka.actor -import akka.japi.{ Creator, Procedure } -import akka.dispatch.{ MessageDispatcher, Promise } +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': diff --git a/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala index cc2d7a5e96..c4742df81a 100644 --- a/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala +++ b/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala @@ -5,13 +5,9 @@ package akka.dispatch import util.DynamicVariable -import akka.actor.{ ActorCell, Actor, IllegalActorStateException, ActorRef } +import akka.actor.{ ActorCell, ActorRef } import java.util.concurrent.{ LinkedBlockingQueue, ConcurrentLinkedQueue, ConcurrentSkipListSet } -import java.util.{ Comparator, Queue } import annotation.tailrec -import akka.actor.ActorSystem -import akka.event.EventStream -import akka.actor.Scheduler import java.util.concurrent.atomic.AtomicBoolean import akka.util.Duration diff --git a/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala b/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala index b622c52c74..3871905905 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala +++ b/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala @@ -9,12 +9,9 @@ import akka.util.{ Duration, ReflectiveAccess } import akka.actor.ActorSystem import akka.event.EventStream import akka.actor.Scheduler -import akka.actor.ActorSystem.Settings import com.typesafe.config.Config import com.typesafe.config.ConfigFactory -import akka.config.ConfigurationException import akka.event.Logging.Warning -import akka.actor.Props import java.util.concurrent.{ ThreadFactory, TimeUnit, ConcurrentHashMap } trait DispatcherPrerequisites { diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala index 09ce22d6b8..2663aff23e 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Future.scala +++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala @@ -4,25 +4,22 @@ package akka.dispatch -import akka.AkkaException import akka.event.Logging.Error -import akka.util.Timeout import scala.Option -import akka.japi.{ Procedure, Function ⇒ JFunc, Option ⇒ JOption } +import akka.japi.{ Function ⇒ JFunc, Option ⇒ JOption } import scala.util.continuations._ -import java.util.concurrent.TimeUnit.{ NANOSECONDS, MILLISECONDS } +import java.util.concurrent.TimeUnit.{ NANOSECONDS } import java.lang.{ Iterable ⇒ JIterable } import java.util.{ LinkedList ⇒ JLinkedList } import scala.annotation.tailrec import scala.collection.mutable.Stack -import akka.util.{ Switch, Duration, BoxedType } -import java.util.concurrent.atomic.{ AtomicReferenceFieldUpdater, AtomicInteger, AtomicBoolean } +import akka.util.{ Duration, BoxedType } +import java.util.concurrent.atomic.{ AtomicReferenceFieldUpdater, AtomicInteger } import akka.dispatch.Await.CanAwait import java.util.concurrent._ -import akka.actor.ActorSystem object Await { sealed trait CanAwait diff --git a/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala b/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala index 40d4650f0d..d2bc7ff01d 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala +++ b/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala @@ -10,7 +10,6 @@ import akka.actor.{ ActorCell, ActorRef } import java.util.concurrent._ import annotation.tailrec import akka.event.Logging.Error -import com.typesafe.config.Config import akka.actor.ActorContext class MessageQueueAppendFailedException(message: String, cause: Throwable = null) extends AkkaException(message, cause) diff --git a/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala index c88113fc64..246b1f591a 100644 --- a/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala +++ b/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala @@ -4,13 +4,8 @@ package akka.dispatch -import java.util.concurrent.atomic.AtomicReference import akka.actor.ActorCell -import akka.actor.ActorSystem -import akka.event.EventStream -import akka.actor.Scheduler import akka.util.Duration -import java.util.concurrent.TimeUnit /** * Dedicates a unique thread for each actor passed in as reference. Served through its messageQueue. diff --git a/akka-actor/src/main/scala/akka/dispatch/PromiseStream.scala b/akka-actor/src/main/scala/akka/dispatch/PromiseStream.scala index b6305701b2..b1c25f55e1 100644 --- a/akka-actor/src/main/scala/akka/dispatch/PromiseStream.scala +++ b/akka-actor/src/main/scala/akka/dispatch/PromiseStream.scala @@ -6,7 +6,7 @@ package akka.dispatch import java.util.concurrent.atomic.AtomicReference import scala.util.continuations._ -import scala.annotation.{ tailrec } +import scala.annotation.tailrec import akka.util.Timeout object PromiseStream { diff --git a/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala b/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala index 9601c4dd5e..f8927f667a 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 java.util.concurrent.atomic.{ AtomicLong, AtomicInteger } +import java.util.concurrent.atomic.AtomicLong import akka.util.Duration import java.util.concurrent._ diff --git a/akka-actor/src/main/scala/akka/dispatch/japi/Future.scala b/akka-actor/src/main/scala/akka/dispatch/japi/Future.scala index ac4ef7694e..a237c0c647 100644 --- a/akka-actor/src/main/scala/akka/dispatch/japi/Future.scala +++ b/akka-actor/src/main/scala/akka/dispatch/japi/Future.scala @@ -3,8 +3,7 @@ */ package akka.dispatch.japi -import akka.util.Timeout -import akka.japi.{ Procedure2, Procedure, Function ⇒ JFunc, Option ⇒ JOption } +import akka.japi.{ Procedure2, Procedure, Function ⇒ JFunc } /* Java API */ trait Future[+T] { self: akka.dispatch.Future[T] ⇒ diff --git a/akka-actor/src/main/scala/akka/routing/ConnectionManager.scala b/akka-actor/src/main/scala/akka/routing/ConnectionManager.scala index 3ce73f5020..94ceffb91f 100644 --- a/akka-actor/src/main/scala/akka/routing/ConnectionManager.scala +++ b/akka-actor/src/main/scala/akka/routing/ConnectionManager.scala @@ -6,11 +6,6 @@ package akka.routing import akka.actor._ -import scala.annotation.tailrec - -import java.util.concurrent.atomic.{ AtomicReference, AtomicInteger } -import collection.JavaConverters - /** * An Iterable that also contains a version. */ diff --git a/akka-actor/src/main/scala/akka/routing/Routing.scala b/akka-actor/src/main/scala/akka/routing/Routing.scala index c6fb245d6a..4ef7cff330 100644 --- a/akka-actor/src/main/scala/akka/routing/Routing.scala +++ b/akka-actor/src/main/scala/akka/routing/Routing.scala @@ -4,11 +4,9 @@ package akka.routing import akka.actor._ -import akka.dispatch.{ Future, Promise } -import java.util.concurrent.atomic.AtomicLong -import java.util.concurrent.atomic.AtomicBoolean +import java.util.concurrent.atomic.{ AtomicLong, AtomicBoolean } import java.util.concurrent.TimeUnit -import akka.util.{ Duration, Timeout } +import akka.util.Duration import akka.util.duration._ import com.typesafe.config.Config import akka.config.ConfigurationException diff --git a/akka-actor/src/main/scala/akka/util/ByteString.scala b/akka-actor/src/main/scala/akka/util/ByteString.scala index 125b605a89..dd38fe3bdd 100644 --- a/akka-actor/src/main/scala/akka/util/ByteString.scala +++ b/akka-actor/src/main/scala/akka/util/ByteString.scala @@ -3,10 +3,10 @@ package akka.util import java.nio.ByteBuffer import java.nio.charset.Charset -import scala.collection.{ IndexedSeqOptimized, LinearSeq } -import scala.collection.mutable.{ Builder, ArrayBuilder, WrappedArray } +import scala.collection.{ IndexedSeqOptimized } +import scala.collection.mutable.{ Builder, WrappedArray } import scala.collection.immutable.{ IndexedSeq, VectorBuilder } -import scala.collection.generic.{ CanBuildFrom, GenericCompanion } +import scala.collection.generic.{ CanBuildFrom } object ByteString { diff --git a/akka-actor/src/main/scala/akka/util/Duration.scala b/akka-actor/src/main/scala/akka/util/Duration.scala index 00dc1ae7e1..65d6e6148c 100644 --- a/akka-actor/src/main/scala/akka/util/Duration.scala +++ b/akka-actor/src/main/scala/akka/util/Duration.scala @@ -6,8 +6,7 @@ package akka.util import java.util.concurrent.TimeUnit import TimeUnit._ -import java.lang.{ Long ⇒ JLong, Double ⇒ JDouble } -import akka.actor.ActorSystem +import java.lang.{ Double ⇒ JDouble } class TimerException(message: String) extends RuntimeException(message) diff --git a/akka-actor/src/main/scala/akka/util/Helpers.scala b/akka-actor/src/main/scala/akka/util/Helpers.scala index d98e0a49f1..60e6be8b65 100644 --- a/akka-actor/src/main/scala/akka/util/Helpers.scala +++ b/akka-actor/src/main/scala/akka/util/Helpers.scala @@ -3,7 +3,6 @@ */ package akka.util -import java.io.{ PrintWriter, StringWriter } import java.util.Comparator import scala.annotation.tailrec import java.util.regex.Pattern diff --git a/akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala b/akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala index 18ed6a5020..7c00d69225 100644 --- a/akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala +++ b/akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala @@ -4,7 +4,6 @@ package akka.util -import akka.actor._ import java.lang.reflect.InvocationTargetException object ReflectiveAccess {