raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Upper case for Implicits object and made the CircuitOpenException extending RuntimeException

Browse source
This commit is contained in:
galarragas 2016-01-04 19:10:30 +00:00
parent adf49a33f0
commit 9814ff5613
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-contrib/docs/circuitbreaker.rst
View file

@ -36,12 +36,12 @@ temporary failures in the target actor.
You can decide to do that in two ways:
The first is to use the ``askWithCircuitBreaker`` method on the ``ActorRef`` or ``ActorSelection`` instance pointing to
your circuit breaker proxy (enabled by importing ``import akka.contrib.circuitbreaker.implicits.askWithCircuitBreaker``)
your circuit breaker proxy (enabled by importing ``import akka.contrib.circuitbreaker.Implicits.askWithCircuitBreaker``)
.. includecode:: @contribSrc@/src/test/scala/akka/contrib/circuitbreaker/sample/CircuitBreaker.scala#ask-with-circuit-breaker-sample
The second is to map the future response of your ``ask`` pattern application with the ``failForOpenCircuit``
enabled by importing ``import akka.contrib.circuitbreaker.implicits.futureExtensions``
enabled by importing ``import akka.contrib.circuitbreaker.Implicits.futureExtensions``
.. includecode:: @contribSrc@/src/test/scala/akka/contrib/circuitbreaker/sample/CircuitBreaker.scala#ask-with-failure-sample

8
akka-contrib/src/main/scala/akka/contrib/circuitbreaker/askExtensions.scala
View file

@ -10,7 +10,7 @@ import scala.language.implicitConversions
import scala.concurrent.{ ExecutionContext, Future }
final class OpenCircuitException extends Exception("Unable to complete operation since the Circuit Breaker Actor Proxy is in Open State")
final class OpenCircuitException extends RuntimeException("Unable to complete operation since the Circuit Breaker Actor Proxy is in Open State")
/**
* Convenience implicit conversions to provide circuit-breaker aware management of the ask pattern,
@ -18,7 +18,7 @@ final class OpenCircuitException extends Exception("Unable to complete operation
* `Future` result of an `ask` pattern to fail in case of
* [[akka.contrib.circuitbreaker.CircuitBreakerProxy.CircuitOpenFailure]] response
*/
object implicits {
object Implicits {
/**
* Import this implicit to enable the methods `failForOpenCircuit` and `failForOpenCircuitWith`
* to [[scala.concurrent.Future]] converting
@ -81,7 +81,7 @@ final class AskeableWithCircuitBreakerActor(val actorRef: ActorRef) extends AnyV
@throws[OpenCircuitException]
private[circuitbreaker] def internalAskWithCircuitBreaker(message: Any, timeout: Timeout, sender: ActorRef)(implicit executionContext: ExecutionContext) = {
import akka.pattern.ask
import implicits.futureExtensions
import Implicits.futureExtensions
ask(actorRef, message, sender)(timeout).failForOpenCircuit
}
@ -93,7 +93,7 @@ final class AskeableWithCircuitBreakerActorSelection(val actorSelection: ActorSe
private[circuitbreaker] def internalAskWithCircuitBreaker(message: Any, timeout: Timeout, sender: ActorRef)(implicit executionContext: ExecutionContext) = {
import akka.pattern.ask
import implicits.futureExtensions
import Implicits.futureExtensions
ask(actorSelection, message, sender)(timeout).failForOpenCircuit
}

4
akka-contrib/src/test/scala/akka/contrib/circuitbreaker/CircuitBreakerProxySpec.scala
View file

@ -411,7 +411,7 @@ class CircuitBreakerProxySpec extends AkkaSpec() with GivenWhenThen with Matcher
"Ask Extension" should {
implicit val patienceConfig = PatienceConfig(timeout = Span(1, Second), interval = Span(100, Millis))
import implicits.askWithCircuitBreaker
import Implicits.askWithCircuitBreaker
import scala.concurrent.ExecutionContext.Implicits.global
implicit val timeout: Timeout = 2.seconds
@ -460,7 +460,7 @@ class CircuitBreakerProxySpec extends AkkaSpec() with GivenWhenThen with Matcher
"Future Extension" should {
implicit val patienceConfig = PatienceConfig(timeout = Span(1, Second), interval = Span(100, Millis))
import implicits.futureExtensions
import Implicits.futureExtensions
import akka.pattern.ask
import scala.concurrent.ExecutionContext.Implicits.global

4
akka-contrib/src/test/scala/akka/contrib/circuitbreaker/sample/CircuitBreaker.scala
View file

@ -144,7 +144,7 @@ class CircuitBreakerAsk(potentiallyFailingService: ActorRef) extends Actor with
class CircuitBreakerAskWithFailure(potentiallyFailingService: ActorRef) extends Actor with ActorLogging {
import SimpleService._
import akka.pattern._
import akka.contrib.circuitbreaker.implicits.futureExtensions
import akka.contrib.circuitbreaker.Implicits.futureExtensions
implicit val askTimeout: Timeout = 2.seconds
@ -175,7 +175,7 @@ class CircuitBreakerAskWithFailure(potentiallyFailingService: ActorRef) extends
//#ask-with-circuit-breaker-sample
class CircuitBreakerAskWithCircuitBreaker(potentiallyFailingService: ActorRef) extends Actor with ActorLogging {
import SimpleService._
import akka.contrib.circuitbreaker.implicits.askWithCircuitBreaker
import akka.contrib.circuitbreaker.Implicits.askWithCircuitBreaker
implicit val askTimeout: Timeout = 2.seconds