From cacba818f249a468d3241c44e1278abf4851a579 Mon Sep 17 00:00:00 2001 From: Martin Krasser Date: Thu, 7 Oct 2010 14:45:40 +0200 Subject: [PATCH] Moved Java API support to japi package. --- akka-actor/src/main/scala/actor/Agent.scala | 2 +- .../scala/dataflow/DataFlowVariable.scala | 2 +- akka-actor/src/main/scala/japi/JavaAPI.scala | 78 ++++++++++++++++++ akka-actor/src/main/scala/util/JavaAPI.scala | 81 ------------------- .../main/scala/CamelContextLifecycle.scala | 2 +- akka-camel/src/main/scala/CamelService.scala | 2 +- .../scala/CamelServiceSpringFeatureTest.scala | 6 +- 7 files changed, 85 insertions(+), 88 deletions(-) create mode 100644 akka-actor/src/main/scala/japi/JavaAPI.scala delete mode 100644 akka-actor/src/main/scala/util/JavaAPI.scala diff --git a/akka-actor/src/main/scala/actor/Agent.scala b/akka-actor/src/main/scala/actor/Agent.scala index 76e3e1d9db..6b9385ca4e 100644 --- a/akka-actor/src/main/scala/actor/Agent.scala +++ b/akka-actor/src/main/scala/actor/Agent.scala @@ -6,7 +6,7 @@ package se.scalablesolutions.akka.actor import se.scalablesolutions.akka.stm.Ref import se.scalablesolutions.akka.AkkaException -import se.scalablesolutions.akka.util.JavaAPI.{ Function => JFunc, Procedure => JProc } +import se.scalablesolutions.akka.japi.{ Function => JFunc, Procedure => JProc } import java.util.concurrent.atomic.AtomicReference import java.util.concurrent.CountDownLatch diff --git a/akka-actor/src/main/scala/dataflow/DataFlowVariable.scala b/akka-actor/src/main/scala/dataflow/DataFlowVariable.scala index 9c91b40833..56face4b6b 100644 --- a/akka-actor/src/main/scala/dataflow/DataFlowVariable.scala +++ b/akka-actor/src/main/scala/dataflow/DataFlowVariable.scala @@ -11,7 +11,7 @@ import se.scalablesolutions.akka.actor.{Actor, ActorRef} import se.scalablesolutions.akka.actor.Actor._ import se.scalablesolutions.akka.dispatch.CompletableFuture import se.scalablesolutions.akka.AkkaException -import se.scalablesolutions.akka.util.JavaAPI.{ Function, SideEffect } +import se.scalablesolutions.akka.japi.{ Function, SideEffect } /** * Implements Oz-style dataflow (single assignment) variables. diff --git a/akka-actor/src/main/scala/japi/JavaAPI.scala b/akka-actor/src/main/scala/japi/JavaAPI.scala new file mode 100644 index 0000000000..7e79fe8184 --- /dev/null +++ b/akka-actor/src/main/scala/japi/JavaAPI.scala @@ -0,0 +1,78 @@ +package se.scalablesolutions.akka.japi + +/** + * A Function interface. Used to create first-class-functions is Java (sort of). + */ +trait Function[T,R] { + def apply(param: T): R +} + +/** A Procedure is like a Function, but it doesn't produce a return value + */ +trait Procedure[T] { + def apply(param: T): Unit +} + +/** + * An executable piece of code that takes no parameters and doesn't return any value. + */ +trait SideEffect { + def apply: Unit +} + +/** + * This class represents optional values. Instances of Option + * are either instances of case class Some or it is case + * object None. + *

+ * Java API + */ +sealed abstract class Option[A] extends java.lang.Iterable[A] { + import scala.collection.JavaConversions._ + + def get: A + def isEmpty: Boolean + def isDefined = !isEmpty + def asScala: scala.Option[A] + def iterator = if (isEmpty) Iterator.empty else Iterator.single(get) +} + +object Option { + /** + * Option factory that creates Some + */ + def some[A](v: A): Option[A] = Some(v) + + /** + * Option factory that creates None + */ + def none[A] = None.asInstanceOf[Option[A]] + + /** + * Option factory that creates None if + * v is null, Some(v) otherwise. + */ + def option[A](v: A): Option[A] = if (v == null) none else some(v) + + /** + * Class Some[A] represents existing values of type + * A. + */ + final case class Some[A](v: A) extends Option[A] { + def get = v + def isEmpty = false + def asScala = scala.Some(v) + } + + /** + * This case object represents non-existent values. + */ + private case object None extends Option[Nothing] { + def get = throw new NoSuchElementException("None.get") + def isEmpty = true + def asScala = scala.None + } + + implicit def java2ScalaOption[A](o: Option[A]): scala.Option[A] = o.asScala + implicit def scala2JavaOption[A](o: scala.Option[A]): Option[A] = option(o.get) +} \ No newline at end of file diff --git a/akka-actor/src/main/scala/util/JavaAPI.scala b/akka-actor/src/main/scala/util/JavaAPI.scala deleted file mode 100644 index 8222cde235..0000000000 --- a/akka-actor/src/main/scala/util/JavaAPI.scala +++ /dev/null @@ -1,81 +0,0 @@ -package se.scalablesolutions.akka.util - -object JavaAPI { - /** - * A Function interface. Used to create first-class-functions is Java (sort of). - */ - trait Function[T,R] { - def apply(param: T): R - } - - /** A Procedure is like a Function, but it doesn't produce a return value - */ - trait Procedure[T] { - def apply(param: T): Unit - } - - /** - * An executable piece of code that takes no parameters and doesn't return any value. - */ - trait SideEffect { - def apply: Unit - } - - /** - * This class represents optional values. Instances of Option - * are either instances of case class Some or it is case - * object None. - *

- * Java API - */ - sealed abstract class Option[A] extends java.lang.Iterable[A] { - import scala.collection.JavaConversions._ - - def get: A - def isEmpty: Boolean - def isDefined = !isEmpty - def asScala: scala.Option[A] - def iterator = if (isEmpty) Iterator.empty else Iterator.single(get) - } - - object Option { - /** - * Option factory that creates Some - */ - def some[A](v: A): Option[A] = Some(v) - - /** - * Option factory that creates None - */ - def none[A] = None.asInstanceOf[Option[A]] - - /** - * Option factory that creates None if - * v is null, Some(v) otherwise. - */ - def option[A](v: A): Option[A] = if (v == null) none else some(v) - - /** - * Class Some[A] represents existing values of type - * A. - */ - private final case class Some[A](v: A) extends Option[A] { - def get = v - def isEmpty = false - def asScala = scala.Some(v) - } - - /** - * This case object represents non-existent values. - */ - private case object None extends Option[Nothing] { - def get = throw new NoSuchElementException("None.get") - def isEmpty = true - def asScala = scala.None - } - - implicit def java2ScalaOption[A](o: Option[A]): scala.Option[A] = o.asScala - implicit def scala2JavaOption[A](o: scala.Option[A]): Option[A] = option(o.get) - } -} - diff --git a/akka-camel/src/main/scala/CamelContextLifecycle.scala b/akka-camel/src/main/scala/CamelContextLifecycle.scala index 7aadac8ac1..3996cd7baf 100644 --- a/akka-camel/src/main/scala/CamelContextLifecycle.scala +++ b/akka-camel/src/main/scala/CamelContextLifecycle.scala @@ -10,8 +10,8 @@ import org.apache.camel.{ProducerTemplate, CamelContext} import org.apache.camel.impl.DefaultCamelContext import se.scalablesolutions.akka.camel.component.TypedActorComponent +import se.scalablesolutions.akka.japi.{Option => JOption} import se.scalablesolutions.akka.util.Logging -import se.scalablesolutions.akka.util.JavaAPI.{Option => JOption} /** * Manages the lifecycle of a CamelContext. Allowed transitions are diff --git a/akka-camel/src/main/scala/CamelService.scala b/akka-camel/src/main/scala/CamelService.scala index 8509c10b64..d53ff07dec 100644 --- a/akka-camel/src/main/scala/CamelService.scala +++ b/akka-camel/src/main/scala/CamelService.scala @@ -10,7 +10,7 @@ import org.apache.camel.CamelContext import se.scalablesolutions.akka.actor.Actor._ import se.scalablesolutions.akka.actor.{AspectInitRegistry, ActorRegistry} import se.scalablesolutions.akka.config.Config._ -import se.scalablesolutions.akka.util.JavaAPI.{Option => JOption} +import se.scalablesolutions.akka.japi.{Option => JOption} import se.scalablesolutions.akka.util.{Logging, Bootable} /** diff --git a/akka-spring/src/test/scala/CamelServiceSpringFeatureTest.scala b/akka-spring/src/test/scala/CamelServiceSpringFeatureTest.scala index 94b36b3192..246ad88f37 100644 --- a/akka-spring/src/test/scala/CamelServiceSpringFeatureTest.scala +++ b/akka-spring/src/test/scala/CamelServiceSpringFeatureTest.scala @@ -21,7 +21,7 @@ class CamelServiceSpringFeatureTest extends FeatureSpec with BeforeAndAfterEach import CamelContextManager._ scenario("with a custom CamelContext and access a registered typed actor") { val appctx = new ClassPathXmlApplicationContext("/appContextCamelServiceCustom.xml") - assert(context.isInstanceOf[SpringCamelContext]) + assert(mandatoryContext.isInstanceOf[SpringCamelContext]) assert("hello sample" === mandatoryTemplate.requestBody("direct:test", "sample")) appctx.close } @@ -32,8 +32,8 @@ class CamelServiceSpringFeatureTest extends FeatureSpec with BeforeAndAfterEach val registry = new SimpleRegistry registry.put("custom", TypedActor.newInstance(classOf[SampleBeanIntf], classOf[SampleBean])) // set custom registry in DefaultCamelContext - assert(context.isInstanceOf[DefaultCamelContext]) - context.asInstanceOf[DefaultCamelContext].setRegistry(registry) + assert(mandatoryContext.isInstanceOf[DefaultCamelContext]) + mandatoryContext.asInstanceOf[DefaultCamelContext].setRegistry(registry) // access registered typed actor assert("hello sample" === mandatoryTemplate.requestBody("typed-actor:custom?method=foo", "sample")) appctx.close