Merge pull request codingwell#18 from michalkowol/develop

Use javax.inject.Provider

Author: tsuckow

src/main/scala/net/codingwell/scalaguice/ScalaModule.scala

@@ -18,6 +18,7 @@ package net.codingwell.scalaguice
 import com.google.inject._
 import binder._
 import java.lang.annotation.Annotation
+import javax.inject.Provider
 
 /**
  * Allows binding via type parameters. Mix into <code>AbstractModule</code>

src/test/scala/net/codingwell/scalaguice/ClassesForTesting.scala

@@ -57,3 +57,13 @@ class GenStringProvider extends Provider[Gen[String]] {
 class CProvider extends Provider[C] {
   def get = new C
 }
+
+trait Foo {
+  def foo(): String
+}
+
+class FooProviderWithJavax extends javax.inject.Provider[Foo] {
+  def get(): Foo = new Foo {
+    def foo() = "foo"
+  }
+}

src/test/scala/net/codingwell/scalaguice/ScalaModuleSpec.scala

@@ -88,6 +88,15 @@ class ScalaModuleSpec extends WordSpec with ShouldMatchers {
       Guice.createInjector(module).getInstance(Key.get(classOf[A],classOf[Named]))
     }
 
+    "allow use provider form javax.inject.Provider" in {
+      val module = new AbstractModule with ScalaModule {
+        def configure() {
+          bind[Foo].toProvider[FooProviderWithJavax]
+        }
+      }
+      Guice.createInjector(module).getInstance(classOf[Foo])
+    }
+
     "give a useful error when bound on itself" in {
       val module = new AbstractModule with ScalaModule {
         def configure() = {