deal with mapValues

Author: cacoco

src/main/scala-2.12-/net/codingwell/scalaguice/SetProvider.scala

@@ -33,7 +33,7 @@ import scala.collection.{immutable => im}
  */
 class SetProvider[T] (val source:Key[JSet[T]]) extends ProviderWithDependencies[im.Set[T]] {
 
-  @Inject() var injector:Injector = null
+  @Inject() var injector:Injector = _
 
   def get():im.Set[T] = {
     injector.getInstance( source ).asScala.toSet[T]

src/main/scala-2.13+/net/codingwell/scalaguice/SetProvider.scala

@@ -33,7 +33,7 @@ import scala.jdk.CollectionConverters._
  */
 class SetProvider[T] (val source:Key[JSet[T]]) extends ProviderWithDependencies[im.Set[T]] {
 
-  @Inject() var injector:Injector = null
+  @Inject() var injector:Injector = _
 
   def get():im.Set[T] = {
     injector.getInstance( source ).asScala.toSet[T]

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

@@ -368,44 +368,44 @@ class ScalaMapBinderSpec extends AnyWordSpec with Matchers {
     val injector = Guice.createInjector(module)
 
     validate(injector.instance[im.Map[K, V]], expected: _*)
-    validate(injector.instance[im.Map[K, Provider[V]]].mapValues(_.get), expected: _*)
-    validate(injector.instance[im.Map[K, javax.inject.Provider[V]]].mapValues(_.get), expected: _*)
+    validate(injector.instance[im.Map[K, Provider[V]]].transform { case (_, provider) => provider.get() }, expected: _*)
+    validate(injector.instance[im.Map[K, javax.inject.Provider[V]]].transform { case (_, provider) => provider.get() }, expected: _*)
   }
 
   private def validateWithAnnotation[K: TypeTag, V: TypeTag](module: Module, annotation: Annotation, expected: (K, V)*): Unit = {
     val injector = Guice.createInjector(module)
 
     validate(injector.instance[im.Map[K, V]](annotation), expected: _*)
-    validate(injector.instance[im.Map[K, Provider[V]]](annotation).mapValues(_.get), expected: _*)
-    validate(injector.instance[im.Map[K, javax.inject.Provider[V]]](annotation).mapValues(_.get), expected: _*)
+    validate(injector.instance[im.Map[K, Provider[V]]](annotation).transform { case (_, provider) => provider.get() }, expected: _*)
+    validate(injector.instance[im.Map[K, javax.inject.Provider[V]]](annotation).transform { case (_, provider) => provider.get() }, expected: _*)
   }
 
   private def validateWithAnn[K: TypeTag, V: TypeTag, Ann <: Annotation : ClassTag](module: Module, expected: (K, V)*): Unit = {
     val injector = Guice.createInjector(module)
 
     validate(injector.instance[im.Map[K, V], Ann], expected: _*)
-    validate(injector.instance[im.Map[K, Provider[V]], Ann].mapValues(_.get), expected: _*)
-    validate(injector.instance[im.Map[K, javax.inject.Provider[V]], Ann].mapValues(_.get), expected: _*)
+    validate(injector.instance[im.Map[K, Provider[V]], Ann].transform { case (_, provider) => provider.get() }, expected: _*)
+    validate(injector.instance[im.Map[K, javax.inject.Provider[V]], Ann].transform { case (_, provider) => provider.get() }, expected: _*)
   }
 
   private def validateMultiMap[K: TypeTag, V: TypeTag](module: Module, expected: (K, im.Set[V])*): Unit = {
     val injector = Guice.createInjector(module)
 
     validate(injector.instance[im.Map[K, im.Set[V]]], expected: _*)
-    validate(injector.instance[im.Map[K, im.Set[Provider[V]]]].mapValues(_.map(_.get)), expected: _*)
+    validate(injector.instance[im.Map[K, im.Set[Provider[V]]]].transform { case (_, providers) => providers.map(_.get) }, expected: _*)
   }
 
   private def validateMultiMapWithAnnotation[K: TypeTag, V: TypeTag](module: Module, annotation: Annotation, expected: (K, im.Set[V])*): Unit = {
     val injector = Guice.createInjector(module)
 
     validate(injector.instance[im.Map[K, im.Set[V]]](annotation), expected: _*)
-    validate(injector.instance[im.Map[K, im.Set[Provider[V]]]](annotation).mapValues(_.map(_.get)), expected: _*)
+    validate(injector.instance[im.Map[K, im.Set[Provider[V]]]](annotation).transform { case (_, providers) => providers.map(_.get) }, expected: _*)
   }
 
   private def validateMultiMapWithAnn[K: TypeTag, V: TypeTag, Ann <: Annotation : ClassTag](module: Module, expected: (K, im.Set[V])*): Unit = {
     val injector = Guice.createInjector(module)
 
     validate(injector.instance[im.Map[K, im.Set[V]], Ann], expected: _*)
-    validate(injector.instance[im.Map[K, im.Set[Provider[V]]], Ann].mapValues(_.map(_.get)), expected: _*)
+    validate(injector.instance[im.Map[K, im.Set[Provider[V]]], Ann].transform { case (_, providers) => providers.map(_.get) }, expected: _*)
   }
 }