Merge pull request #1872 from akka/wip-2770-remove-timerActive-patriknw

!act #2770 Remove deprecated FSM.timerActive_?

akka-actor/src/main/scala/akka/actor/FSM.scala

@@ -370,14 +370,6 @@ trait FSM[S, D] extends Actor with Listeners with ActorLogging {
     }
   }
 
-  /**
-   * Inquire whether the named timer is still active. Returns true unless the
-   * timer does not exist, has previously been canceled or if it was a
-   * single-shot timer whose message was already received.
-   */
-  @deprecated("use isTimerActive instead", "2.2")
-  final def timerActive_?(name: String): Boolean = isTimerActive(name)
-
   /**
    * Inquire whether the named timer is still active. Returns true unless the
    * timer does not exist, has previously been canceled or if it was a

akka-actor/src/main/scala/akka/actor/TypedActor.scala

@@ -135,10 +135,6 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi
     def returnsJOption = classOf[akka.japi.Option[_]] isAssignableFrom method.getReturnType
     def returnsOption = classOf[scala.Option[_]] isAssignableFrom method.getReturnType
 
-    @deprecated("use returnsFuture instead", "2.2") def returnsFuture_? = returnsFuture
-    @deprecated("use returnsJOption instead", "2.2") def returnsJOption_? = returnsJOption
-    @deprecated("use returnsOption instead", "2.2") def returnsOption_? = returnsOption
-
     /**
      * Invokes the Method on the supplied instance
      *
@@ -685,7 +681,7 @@ class TypedActorExtension(val system: ExtendedActorSystem) extends TypedActorFac
   /**
    * INTERNAL API
    */
-  private[akka] def invocationHandlerFor(@deprecatedName('typedActor_?) typedActor: AnyRef): TypedActorInvocationHandler =
+  private[akka] def invocationHandlerFor(typedActor: AnyRef): TypedActorInvocationHandler =
     if ((typedActor ne null) && classOf[Proxy].isAssignableFrom(typedActor.getClass) && Proxy.isProxyClass(typedActor.getClass)) typedActor match {
       case null ⇒ null
       case other ⇒ Proxy.getInvocationHandler(other) match {

akka-docs/rst/project/migration-guide-2.2.x-2.3.x.rst

@@ -102,7 +102,9 @@ has been renamed to ``akka.cluster.failure-detector.expected-response-after``.
 Removed Deprecated Features
 ===========================
 
-The following, previously deprecated features have been removed:
+The following, previously deprecated, features have been removed:
 
  * `event-handlers renamed to loggers <http://doc.akka.io/docs/akka/2.2.3/project/migration-guide-2.1.x-2.2.x.html#event-handlers_renamed_to_loggers>`_ 
+ * `API changes to FSM and TestFSMRef <http://doc.akka.io/docs/akka/2.2.3/project/migration-guide-2.1.x-2.2.x.html#API_changes_to_FSM_and_TestFSMRef>`_
+ 
  

akka-testkit/src/main/scala/akka/testkit/TestFSMRef.scala

@@ -65,27 +65,24 @@ class TestFSMRef[S, D, T <: Actor](
   }
 
   /**
-   * Proxy for FSM.setTimer.
+   * Proxy for [[FSM#setTimer]].
    */
   def setTimer(name: String, msg: Any, timeout: FiniteDuration, repeat: Boolean) {
     fsm.setTimer(name, msg, timeout, repeat)
   }
 
   /**
-   * Proxy for FSM.cancelTimer.
+   * Proxy for [[FSM#cancelTimer]].
    */
   def cancelTimer(name: String) { fsm.cancelTimer(name) }
 
-  @deprecated("Use isTimerActive", "2.2")
-  def timerActive_?(name: String): Boolean = isTimerActive(name)
-
   /**
-   * Proxy for FSM.isTimerActive.
+   * Proxy for [[FSM#isStateTimerActive]].
    */
   def isTimerActive(name: String) = fsm.isTimerActive(name)
 
   /**
-   * Proxy for FSM.timerActive_?.
+   * Proxy for [[FSM#isStateTimerActive]].
    */
   def isStateTimerActive = fsm.isStateTimerActive
 }