Support bindInterceptor[T1, T2]

README.md

@@ -106,6 +106,8 @@ bind[A].toProvider[BProvider]
 bind[A].toProvider[TypeProvider[B]]
 bind[A[String]].to[B[String]]
 bind[A].to[B].in[Singleton]
+
+bindInterceptor[A,B]
 ```
 
 ### Multibinding
@@ -190,6 +192,18 @@ If you call `mapBinder.permitDuplicates()` on the binder then you may also injec
 - `immutable.Map[K, immutable.Set[V]]`
 - `immutable.Map[K, immutable.Set[Provider[V]]]`
 
+### Interceptor Binding
+
+bindInterceptor adds scala style interceptor binding
+
+```java
+bindInterceptor(Matchers.any(), Matchers.annotatedWith(classOf[Logging]), new LoggingInterceptor())
+```
+
+```scala
+bindInterceptor[Logging, LoggingInterceptor]
+```
+
 ## Gotchas
 
 In Scala, the words `override` and `with` are reserved and must be escaped to be used.

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

@@ -15,10 +15,13 @@
  */
 package net.codingwell.scalaguice
 
-import com.google.inject.{PrivateModule, PrivateBinder, Binder, Scope, AbstractModule}
 import binder._
+import com.google.inject.matcher.Matchers
+import com.google.inject.{PrivateModule, PrivateBinder, Binder, Scope, AbstractModule}
 import java.lang.annotation.Annotation
 import javax.inject.Provider
+import org.aopalliance.intercept.MethodInterceptor
+
 
 /**
  * Allows binding via type parameters. Mix into <code>AbstractModule</code>
@@ -33,6 +36,8 @@ import javax.inject.Provider
  *     bind(classOf[CreditCardPaymentService])
  *     bind(new TypeLiteral[Bar[Foo]]{}).to(classOf[FooBarImpl])
  *     bind(classOf[PaymentService]).to(classOf[CreditCardPaymentService])
+ *
+ *     bindInterceptor(Matchers.any(), Matchers.annotatedWith(classOf[Logging]), new LoggingInterceptor())
  *   }
  * }
  * }}}
@@ -44,6 +49,8 @@ import javax.inject.Provider
  *     bind[CreditCardPaymentService]
  *     bind[Bar[Foo]].to[FooBarImpl]
  *     bind[PaymentService].to[CreditCardPaymentService]
+ *
+ *     bindInterceptor[Logging, LoggingInterceptor]
  *   }
  * }
  * }}}
@@ -63,6 +70,12 @@ trait InternalModule[B <: Binder] {
     val self = myBinder.bind(typeLiteral[T])
   }
 
+  protected[this] def bindInterceptor[T <: Annotation : Manifest, T2: Manifest] {
+    val myBinder = binderAccess
+    val interceptor = manifest[T2].runtimeClass.newInstance.asInstanceOf[MethodInterceptor]
+    myBinder.bindInterceptor(Matchers.any(), Matchers.annotatedWith(cls[T]), interceptor)
+  }
+
   protected[this] def bindScope[T <: Annotation : Manifest](scope: Scope) = binderAccess.bindScope(cls[T], scope)
   protected[this] def requestStaticInjection[T: Manifest](): Unit = binderAccess.requestStaticInjection(cls[T])
   protected[this] def getProvider[T: Manifest] = binderAccess.getProvider(cls[T])

src/test/java/net/codingwell/scalaguice/AOP.java

@@ -0,0 +1,32 @@
+/*
+ *  Copyright 2010-2014 Peerapat Asoktummarungsri
+ *
+ * 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.
+ */
+package net.codingwell.scalaguice;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+/**
+ * There is no support for runtime annotation in Scala, so far
+ * Java interfaces need to be used.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface AOP {
+
+}

src/test/java/net/codingwell/scalaguice/AOPI.java

@@ -0,0 +1,28 @@
+/*
+ *  Copyright 2010-2014 Peerapat Asoktummarungsri
+ *
+ * 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.
+ */
+package net.codingwell.scalaguice;
+
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+
+public class AOPI implements MethodInterceptor {
+
+    @Override
+    public Object invoke(MethodInvocation invocation) throws Throwable {
+        return null;
+    }
+
+}

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

@@ -19,7 +19,7 @@ import org.scalatest.{Matchers, WordSpec}
 
 import com.google.inject._
 
-class ScalaModuleSpec extends WordSpec with Matchers {
+class ScalaModuleSpec extends WordSpec with Matchers { 
 
   "A Scala Guice module" should {
 
@@ -123,6 +123,15 @@ class ScalaModuleSpec extends WordSpec with Matchers {
       twoStrings.first should be ("first")
       twoStrings.second should be ("second")
     }
+
+    "allow binding annotation interceptro" in {
+      val module = new AbstractModule with ScalaModule {
+        def configure() = {
+          bindInterceptor[AOP, AOPI]
+        }
+      }
+      Guice.createInjector(module).getInstance(classOf[AOPI])
+    }
   }
 
 }