Support extension extends base impl

aiyanbo · May 25, 2020 · d230e5e · d230e5e
1 parent ea1c8b1
commit d230e5e
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 13 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -10,18 +10,19 @@ object Dependencies extends AutoPlugin {
 
   object Versions {
     val config = "1.4.0"
-    val grpcCore = "1.26.0"
-    val grpcStub = "1.26.0"
+    val grpcCore = "1.29.0"
+    val grpcStub = "1.29.0"
     val guava = "23.0"
-    val guice = "4.2.2"
-    val protobufJava = "3.11.1"
-    val scala = "2.13.1"
+    val guice = "4.2.3"
+    val guiceMultibindings = "4.2.3"
+    val protobufJava = "3.12.1"
+    val scala = "2.13.2"
     val scala212 = "2.12.10"
     val scalaI18n = "1.0.7"
     val scalaLogging = "3.9.2"
-    val scalatest = "3.1.0"
-    val scalikejdbc = "3.4.0"
-    val undertow = "2.0.29.Final"
+    val scalatest = "3.1.2"
+    val scalikejdbc = "3.4.2"
+    val undertow = "2.1.1.Final"
   }
 
   object Compiles {

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.8
+sbt.version=1.3.10
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -4,12 +4,12 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
 
 addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7")
 
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.12")
+addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
 
 addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.3")
 
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
 
 addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2")
 
-addSbtPlugin("org.jmotor.sbt" % "sbt-dependency-updates" % "1.2.1")
+addSbtPlugin("org.jmotor.sbt" % "sbt-dependency-updates" % "1.2.2")
diff --git a/src/main/scala/org/jmotor/guice/AbstractModuleSupport.scala b/src/main/scala/org/jmotor/guice/AbstractModuleSupport.scala
@@ -9,8 +9,8 @@ import com.typesafe.config.Config
 import com.typesafe.scalalogging.LazyLogging
 import org.jmotor.config.ConfigConversions._
 
-import scala.jdk.CollectionConverters._
 import scala.collection.mutable
+import scala.jdk.CollectionConverters._
 
 /**
  * Component:
@@ -60,7 +60,12 @@ abstract class AbstractModuleSupport extends AbstractModule with LazyLogging {
 
   def bindComponent(classInfo: ClassPath.ClassInfo): Unit = {
     val clazz = classInfo.load()
-    val interfaces = clazz.getInterfaces
+    val clazzInterfaces = clazz.getInterfaces
+    val interfaces = if (clazzInterfaces.nonEmpty) {
+      clazzInterfaces
+    } else {
+      clazz.getSuperclass.getInterfaces
+    }
     val interfaceOpt = interfaces.find { irfe ⇒
       clazz.getSimpleName.contains(irfe.getSimpleName) && clazz.getPackage.getName.contains(irfe.getPackage.getName)
     }

diff --git a/src/test/scala/org/jmotor/guice/ModuleSupportSpec.scala b/src/test/scala/org/jmotor/guice/ModuleSupportSpec.scala
@@ -5,6 +5,7 @@ import com.google.inject.TypeLiteral
 import com.typesafe.config.ConfigFactory
 import org.jmotor.guice.service.Conf
 import org.jmotor.guice.service.ConfigService
+import org.jmotor.guice.service.FooService
 import org.jmotor.guice.service.MultiConfigService
 import org.jmotor.guice.service.MultiPingService
 import org.jmotor.guice.service.PingService
@@ -65,4 +66,14 @@ class ModuleSupportSpec extends AnyFunSuite {
     assert(impls.exists(_.isInstanceOf[LongConfigService]))
   }
 
+  test("Test extends extension") {
+    val config = ConfigFactory.parseString("extension.enabled = true")
+    val injector = Guice.createInjector(new AbstractModuleSupport {
+      override def configure(): Unit = bindExtendableComponents("org.jmotor.guice.service.impl", config)
+    })
+    val service = injector.getInstance(classOf[FooService])
+    assert("run" == service.run())
+    assert("invoke" == service.call())
+  }
+
 }
diff --git a/src/test/scala/org/jmotor/guice/service/FooService.scala b/src/test/scala/org/jmotor/guice/service/FooService.scala
@@ -0,0 +1,14 @@
+package org.jmotor.guice.service
+
+/**
+ *
+ * @author AI
+ *         2020/5/25
+ */
+trait FooService {
+
+  def run(): String
+
+  def call(): String
+
+}
diff --git a/src/test/scala/org/jmotor/guice/service/extension/FooServiceImpl.scala b/src/test/scala/org/jmotor/guice/service/extension/FooServiceImpl.scala
@@ -0,0 +1,14 @@
+package org.jmotor.guice.service.extension
+
+import org.jmotor.guice.service.FooService
+
+/**
+ *
+ * @author AI
+ *         2020/5/25
+ */
+class FooServiceImpl extends org.jmotor.guice.service.impl.FooServiceImpl with FooService {
+
+  override def call(): String = "invoke"
+
+}
diff --git a/src/test/scala/org/jmotor/guice/service/impl/FooServiceImpl.scala b/src/test/scala/org/jmotor/guice/service/impl/FooServiceImpl.scala
@@ -0,0 +1,16 @@
+package org.jmotor.guice.service.impl
+
+import org.jmotor.guice.service.FooService
+
+/**
+ *
+ * @author AI
+ *         2020/5/25
+ */
+class FooServiceImpl extends FooService {
+
+  override def run(): String = "run"
+
+  override def call(): String = "call"
+
+}