From 6ff5eb711f5110eafb7bef4d8971b17f0256e90c Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Thu, 27 Sep 2012 12:11:45 +0200 Subject: [PATCH] Capitalizing Camel Settings constants. --- akka-camel/src/main/scala/akka/camel/Camel.scala | 12 ++++++------ akka-camel/src/main/scala/akka/camel/Consumer.scala | 6 +++--- .../camel/internal/ConsumerActorRouteBuilder.scala | 2 +- .../scala/akka/camel/internal/DefaultCamel.scala | 4 ++-- .../camel/internal/component/ActorComponent.scala | 6 +++--- .../src/test/scala/akka/camel/CamelConfigSpec.scala | 10 +++++----- .../camel/internal/component/ActorProducerTest.scala | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/akka-camel/src/main/scala/akka/camel/Camel.scala b/akka-camel/src/main/scala/akka/camel/Camel.scala index db32611868..de2e61fd0d 100644 --- a/akka-camel/src/main/scala/akka/camel/Camel.scala +++ b/akka-camel/src/main/scala/akka/camel/Camel.scala @@ -61,33 +61,33 @@ class CamelSettings private[camel] (config: Config, dynamicAccess: DynamicAccess /** * Configured setting for how long the actor should wait for activation before it fails. */ - final val activationTimeout: FiniteDuration = Duration(config.getMilliseconds("akka.camel.consumer.activation-timeout"), MILLISECONDS) + final val ActivationTimeout: FiniteDuration = Duration(config.getMilliseconds("akka.camel.consumer.activation-timeout"), MILLISECONDS) /** * Configured setting, when endpoint is out-capable (can produce responses) replyTimeout is the maximum time * the endpoint can take to send the response before the message exchange fails. * This setting is used for out-capable, in-only, manually acknowledged communication. */ - final val replyTimeout: FiniteDuration = Duration(config.getMilliseconds("akka.camel.consumer.reply-timeout"), MILLISECONDS) + final val ReplyTimeout: FiniteDuration = Duration(config.getMilliseconds("akka.camel.consumer.reply-timeout"), MILLISECONDS) /** * Configured setting which determines whether one-way communications between an endpoint and this consumer actor * should be auto-acknowledged or application-acknowledged. * This flag has only effect when exchange is in-only. */ - final val autoAck: Boolean = config.getBoolean("akka.camel.consumer.auto-ack") + final val AutoAck: Boolean = config.getBoolean("akka.camel.consumer.auto-ack") /** * */ - final val jmxStatistics: Boolean = config.getBoolean("akka.camel.jmx") + final val JmxStatistics: Boolean = config.getBoolean("akka.camel.jmx") /** * enables or disables streamingCache on the Camel Context */ - final val streamingCache: Boolean = config.getBoolean("akka.camel.streamingCache") + final val StreamingCache: Boolean = config.getBoolean("akka.camel.streamingCache") - final val conversions: (String, RouteDefinition) ⇒ RouteDefinition = { + final val Conversions: (String, RouteDefinition) ⇒ RouteDefinition = { import scala.collection.JavaConverters.asScalaSetConverter val specifiedConversions = { val section = config.getConfig("akka.camel.conversions") diff --git a/akka-camel/src/main/scala/akka/camel/Consumer.scala b/akka-camel/src/main/scala/akka/camel/Consumer.scala index 61ba9a8cc4..506624dbd6 100644 --- a/akka-camel/src/main/scala/akka/camel/Consumer.scala +++ b/akka-camel/src/main/scala/akka/camel/Consumer.scala @@ -42,21 +42,21 @@ trait Consumer extends Actor with CamelSupport { /** * How long the actor should wait for activation before it fails. */ - def activationTimeout: FiniteDuration = camel.settings.activationTimeout + def activationTimeout: FiniteDuration = camel.settings.ActivationTimeout /** * When endpoint is out-capable (can produce responses) replyTimeout is the maximum time * the endpoint can take to send the response before the message exchange fails. It defaults to 1 minute. * This setting is used for out-capable, in-only, manually acknowledged communication. */ - def replyTimeout: FiniteDuration = camel.settings.replyTimeout + def replyTimeout: FiniteDuration = camel.settings.ReplyTimeout /** * Determines whether one-way communications between an endpoint and this consumer actor * should be auto-acknowledged or application-acknowledged. * This flag has only effect when exchange is in-only. */ - def autoAck: Boolean = camel.settings.autoAck + def autoAck: Boolean = camel.settings.AutoAck /** * Returns the route definition handler for creating a custom route to this consumer. diff --git a/akka-camel/src/main/scala/akka/camel/internal/ConsumerActorRouteBuilder.scala b/akka-camel/src/main/scala/akka/camel/internal/ConsumerActorRouteBuilder.scala index 24e2c9a58e..2caf952c6a 100644 --- a/akka-camel/src/main/scala/akka/camel/internal/ConsumerActorRouteBuilder.scala +++ b/akka-camel/src/main/scala/akka/camel/internal/ConsumerActorRouteBuilder.scala @@ -24,7 +24,7 @@ private[camel] class ConsumerActorRouteBuilder(endpointUri: String, consumer: Ac def configure(): Unit = applyUserRouteCustomization( - settings.conversions.apply( + settings.Conversions.apply( endpointUri take endpointUri.indexOf(":"), // e.g. "http" from "http://whatever/..." from(endpointUri).routeId(consumer.path.toString))).to(targetActorUri) diff --git a/akka-camel/src/main/scala/akka/camel/internal/DefaultCamel.scala b/akka-camel/src/main/scala/akka/camel/internal/DefaultCamel.scala index 072e578a05..13d5fe73d1 100644 --- a/akka-camel/src/main/scala/akka/camel/internal/DefaultCamel.scala +++ b/akka-camel/src/main/scala/akka/camel/internal/DefaultCamel.scala @@ -35,9 +35,9 @@ private[camel] class DefaultCamel(val system: ExtendedActorSystem) extends Camel lazy val context: DefaultCamelContext = { val ctx = new DefaultCamelContext - if (!settings.jmxStatistics) ctx.disableJMX() + if (!settings.JmxStatistics) ctx.disableJMX() ctx.setName(system.name) - ctx.setStreamCaching(settings.streamingCache) + ctx.setStreamCaching(settings.StreamingCache) ctx.addComponent("akka", new ActorComponent(this, system)) ctx.getTypeConverterRegistry.addTypeConverter(classOf[FiniteDuration], classOf[String], DurationTypeConverter) ctx 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 2a9ab2155f..2a1be08354 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 @@ -95,9 +95,9 @@ private[camel] trait ActorEndpointConfig { def path: ActorEndpointPath def camel: Camel - @BeanProperty var replyTimeout: FiniteDuration = camel.settings.replyTimeout + @BeanProperty var replyTimeout: FiniteDuration = camel.settings.ReplyTimeout - @BeanProperty var autoAck: Boolean = camel.settings.autoAck + @BeanProperty var autoAck: Boolean = camel.settings.AutoAck } /** @@ -135,7 +135,7 @@ private[camel] class ActorProducer(val endpoint: ActorEndpoint, camel: Camel) ex private[camel] def processExchangeAdapter(exchange: CamelExchangeAdapter): Unit = { val isDone = new CountDownLatch(1) processExchangeAdapter(exchange, new AsyncCallback { def done(doneSync: Boolean) { isDone.countDown() } }) - isDone.await(camel.settings.replyTimeout.toMillis, TimeUnit.MILLISECONDS) + isDone.await(camel.settings.ReplyTimeout.toMillis, TimeUnit.MILLISECONDS) } /** diff --git a/akka-camel/src/test/scala/akka/camel/CamelConfigSpec.scala b/akka-camel/src/test/scala/akka/camel/CamelConfigSpec.scala index 3220d5a3c3..9f4b802081 100644 --- a/akka-camel/src/test/scala/akka/camel/CamelConfigSpec.scala +++ b/akka-camel/src/test/scala/akka/camel/CamelConfigSpec.scala @@ -19,23 +19,23 @@ class CamelConfigSpec extends WordSpec with MustMatchers { } "CamelConfigSpec" must { "have correct activationTimeout config" in { - settings.activationTimeout must be === Duration(config.getMilliseconds("akka.camel.consumer.activation-timeout"), MILLISECONDS) + settings.ActivationTimeout must be === Duration(config.getMilliseconds("akka.camel.consumer.activation-timeout"), MILLISECONDS) } "have correct autoAck config" in { - settings.autoAck must be === config.getBoolean("akka.camel.consumer.auto-ack") + settings.AutoAck must be === config.getBoolean("akka.camel.consumer.auto-ack") } "have correct replyTimeout config" in { - settings.replyTimeout must be === Duration(config.getMilliseconds("akka.camel.consumer.reply-timeout"), MILLISECONDS) + settings.ReplyTimeout must be === Duration(config.getMilliseconds("akka.camel.consumer.reply-timeout"), MILLISECONDS) } "have correct streamingCache config" in { - settings.streamingCache must be === config.getBoolean("akka.camel.streamingCache") + settings.StreamingCache must be === config.getBoolean("akka.camel.streamingCache") } "have correct jmxStatistics config" in { - settings.jmxStatistics must be === config.getBoolean("akka.camel.jmx") + settings.JmxStatistics must be === config.getBoolean("akka.camel.jmx") } "have correct body conversions config" in { 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 258d34b4b8..8f7845d3ff 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 @@ -92,7 +92,7 @@ class ActorProducerTest extends TestKit(ActorSystem("test")) with WordSpec with verify(exchange, never()).setResponse(any[CamelMessage]) info("no response forwarded to exchange") intercept[TimeoutException] { - Await.ready(future, camel.settings.replyTimeout - (1 seconds)) + Await.ready(future, camel.settings.ReplyTimeout - (1 seconds)) } } }