Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixed error handling

  • Loading branch information...
commit 52638262567a20e1a8dce157d8d204a6a422c031 1 parent e9e9864
@eed3si9n authored
View
202 LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
View
65 README.md
@@ -0,0 +1,65 @@
+sff4s
+=====
+
+sff4s (simple future facade for Scala) is a Scala wrapper around several future implementations.
+
+The API mostly mimics that of twitter util's [`Future`][1]:
+
+```scala
+val factory = sff4s.impl.ActorsFuture
+val f = factory future {
+ Thread.sleep(1000)
+ 1
+}
+val g = f map { _ + 1 }
+g(2000) // => This blocks for the futures result (and eventually returns 2)
+
+// Another option:
+g onSuccess { value =>
+ println(value) // => prints "2"
+}
+
+// Using for expressions:
+val xFuture = factory future {1}
+val yFuture = factory future {2}
+
+for {
+ x <- xFuture
+ y <- yFuture
+} {
+ println(x + y) // => prints "3"
+}
+
+// Using implicit conversion
+import factory._
+val native = scala.actors.Futures future {5}
+val w: sff4s.Future[Int] = native
+w() // => This blocks for the futures result (and eventually returns 5)
+```
+
+sff4s-api
+---------
+Platform independent API consisting of `abstract class Future[+A]`, which represents a future value; and `trait Futures`, which represents the dispatcher to create the future values.
+
+sff4s-actors
+------------
+Wrapper around [`scala.actors.Future`][2].
+
+sff4s-juc
+---------
+Wrapper around [`java.util.concurrent.Future`][3].
+
+sff4s-akka
+----------
+Wrapper around [`akka.dispatch.Future`][4].
+
+sff4s-twitter-util
+------------------
+Wrapper around [`com.twitter.util.Future`][5]. Note unlike other implementation, `TwitterUtilFuture.future` does not process the calculation in the background. Instead, you're supposed to create a `Promise` object and set the value using your own concurrency mechanism.
+
+ [1]: https://github.com/twitter/util/blob/master/util-core/src/main/scala/com/twitter/util/Future.scala
+ [2]: http://www.scala-lang.org/api/current/scala/actors/Future.html
+ [3]: http://download.oracle.com/javase/6/docs/api/java/util/concurrent/Future.html
+ [4]: http://akka.io/api/akka/1.1/akka/dispatch/Future.html
+ [5]: http://twitter.github.com/util/util-core/target/site/doc/main/api/com/twitter/util/Future.html
+
View
2  project/build.scala
@@ -38,6 +38,8 @@ object Builds extends Build {
lazy val akka = Project("sff4s-akka", file("sff4s-akka"),
settings = buildSettings ++ Seq(
+ scalaVersion := "2.9.0-1",
+ crossScalaVersions := Seq("2.9.0-1"),
resolvers += "Akka Repo" at "http://akka.io/repository",
libraryDependencies += "se.scalablesolutions.akka" % "akka-actor" % "1.1.3"
)) dependsOn(api % "compile;test->test")
View
12 sff4s-actors/src/main/scala/sff4s/impl/actorsfuture.scala
@@ -3,11 +3,17 @@ package sff4s.impl
import sff4s._
object ActorsFuture extends Futures {
- implicit def toFuture[A](underlying: scala.actors.Future[Either[Throwable, A]]): Future[A] =
- new WrappedActorsFuture(underlying)
+ implicit def toFuture[A](underlying: scala.actors.Future[A]): Future[A] =
+ future { underlying() }
def futureEither[A](result: => Either[Throwable, A]): Future[A] =
- scala.actors.Futures future { result }
+ new WrappedActorsFuture(scala.actors.Futures future {
+ try {
+ result
+ } catch {
+ case e: Throwable => Left(e)
+ }
+ })
}
class WrappedActorsFuture[A](val underlying: scala.actors.Future[Either[Throwable, A]]) extends Future[A] {
View
3  sff4s-actors/src/test/scala/actorsfuturespec.scala
@@ -9,6 +9,9 @@ class ActorsFutureSpec extends FutureSpec { def is =
"behave like a future" ^ isFuture(future, 1)^
"behave like an async calc" ^ isAsync(future)^
endp^
+ "The bad future should" ^
+ "behave like a bad future" ^ isBadFuture(bad, future)^
+ endp^
"The chained future should" ^
"behave like a future" ^ isFuture(mapped, 2)^
"behave like an async calc" ^ isAsync(mapped)^
View
3  sff4s-akka/src/test/scala/akkafuturespec.scala
@@ -9,6 +9,9 @@ class AkkaFutureSpec extends FutureSpec { def is =
"behave like a future" ^ isFuture(future, 1)^
"behave like an async calc" ^ isAsync(future)^
endp^
+ "The bad future should" ^
+ "behave like a bad future" ^ isBadFuture(bad, future)^
+ endp^
"The chained future should" ^
"behave like a future" ^ isFuture(mapped, 2)^
"behave like an async calc" ^ isAsync(mapped)^
View
13 sff4s-api/src/test/scala/futurespec.scala
@@ -25,6 +25,15 @@ trait FutureSpec extends Specification {
def e3 = v(50) must throwA[TimeoutException]
}
+ def isBadFuture(z: => Future[Int], v: => Future[Int]) =
+ "eventually evaluate to an error state" ! B(z, v).e1^
+ "short circuit mapped future to an error state" ! B(z, v).e2
+
+ case class B(z: Future[Int], v: Future[Int]) {
+ def e1 = z.get must beLeft
+ def e2 = (z map {1+}).get must beLeft
+ }
+
def factory: Futures
def future: Future[Int] =
factory future {
@@ -36,4 +45,8 @@ trait FutureSpec extends Specification {
Thread.sleep(100)
result + 1
}
+ def bad: Future[Int] =
+ factory future {
+ (1 / 0) + 1
+ }
}
View
13 sff4s-juc/src/main/scala/sff4s/impl/jucfuture.scala
@@ -10,10 +10,17 @@ object JucSingleThreadExecutorFuture extends JucFuture(
juc.Executors.newSingleThreadExecutor)
class JucFuture(val executor: juc.ExecutorService) extends Futures { self =>
- implicit def toFuture[A](underlying: juc.Future[Either[Throwable, A]]): Future[A] =
- new WrappedJucFuture(underlying)
+ implicit def toFuture[A](underlying: juc.Future[A]): Future[A] =
+ future { underlying() }
- def futureEither[A](result: => Either[Throwable, A]): Future[A] = executor.submit(toCallable(result))
+ def futureEither[A](result: => Either[Throwable, A]): Future[A] =
+ new WrappedJucFuture(executor.submit(toCallable(
+ try {
+ result
+ }
+ catch {
+ case e: Throwable => Left(e)
+ })))
private def toCallable[U](result: => U): juc.Callable[U] = new juc.Callable[U] { def call: U = result }
View
3  sff4s-juc/src/test/scala/jucfuturespec.scala
@@ -9,6 +9,9 @@ class JucFutureSpec extends FutureSpec { def is =
"behave like a future" ^ isFuture(future, 1)^
"behave like an async calc" ^ isAsync(future)^
endp^
+ "The bad future should" ^
+ "behave like a bad future" ^ isBadFuture(bad, future)^
+ endp^
"The chained future should" ^
"behave like a future" ^ isFuture(mapped, 2)^
"behave like an async calc" ^ isAsync(mapped)^
View
3  sff4s-twitter-util/src/test/scala/twitterutilfuturespec.scala
@@ -8,6 +8,9 @@ class TwitterUtilFutureSpec extends FutureSpec { def is =
"The sample future should" ^
"behave like a future" ^ isFuture(future, 1)^
endp^
+ "The bad future should" ^
+ "behave like a bad future" ^ isBadFuture(bad, future)^
+ endp^
"The chained future should" ^
"behave like a future" ^ isFuture(mapped, 2)^
end
Please sign in to comment.
Something went wrong with that request. Please try again.