Remove use of deprecated JavaConversions API

2 files changed, 24 insertions, 25 deletions

diff --git a/container-di/src/test/scala/com/yahoo/container/di/ConfigRetrieverTest.scala b/container-di/src/test/scala/com/yahoo/container/di/ConfigRetrieverTest.scala
index 9d343ce74cf..93618f90e92 100644
--- a/container-di/src/test/scala/com/yahoo/container/di/ConfigRetrieverTest.scala
+++ b/container-di/src/test/scala/com/yahoo/container/di/ConfigRetrieverTest.scala
@@ -1,15 +1,16 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.container.di
 
-import org.junit.Assert._
-import org.hamcrest.CoreMatchers.{is, instanceOf => hamcrestInstanceOf}
+import com.yahoo.config.test.{Bootstrap1Config, Bootstrap2Config, TestConfig}
+import com.yahoo.container.di.ConfigRetriever.{BootstrapConfigs, ComponentsConfigs}
 import com.yahoo.vespa.config.ConfigKey
-import com.yahoo.config.test.{TestConfig, Bootstrap2Config, Bootstrap1Config}
-import com.yahoo.container.di.ConfigRetriever.{ComponentsConfigs, BootstrapConfigs}
-import org.junit.{Ignore, After, Before, Test}
-import scala.collection.JavaConversions._
-import scala.reflect.ClassTag
+import org.hamcrest.CoreMatchers.{is, instanceOf => hamcrestInstanceOf}
 import org.hamcrest.Matcher
+import org.junit.Assert._
+import org.junit.{After, Before, Ignore, Test}
+
+import scala.reflect.ClassTag
+import scala.collection.JavaConverters._
 
 /**
  *
@@ -79,7 +80,7 @@ class ConfigRetrieverTest {
     new ConfigRetriever(
       Set(new ConfigKey(classOf[Bootstrap1Config], configId),
           new ConfigKey(classOf[Bootstrap2Config], configId)),
-      subscriber.getSubscriber(_))
+      (keys) => subscriber.getSubscriber(keys.asJava))
   }
 
   def writeConfig = dirConfigSource.writeConfig _
diff --git a/container-di/src/test/scala/com/yahoo/container/di/ContainerTest.scala b/container-di/src/test/scala/com/yahoo/container/di/ContainerTest.scala
index a571369a759..d8734e81948 100644
--- a/container-di/src/test/scala/com/yahoo/container/di/ContainerTest.scala
+++ b/container-di/src/test/scala/com/yahoo/container/di/ContainerTest.scala
@@ -1,28 +1,26 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.container.di
 
-import com.yahoo.container.di.componentgraph.core.ComponentGraphTest.{SimpleComponent, SimpleComponent2}
-import com.yahoo.container.di.componentgraph.Provider
-import com.yahoo.container.di.componentgraph.core.{ComponentGraph, ComponentNode, Node}
-import org.junit.{After, Before, Ignore, Test}
-import org.junit.Assert._
-import org.hamcrest.CoreMatchers._
-import com.yahoo.config.test.TestConfig
 import com.yahoo.component.AbstractComponent
-import ContainerTest._
-
-import scala.collection.JavaConversions
 import com.yahoo.config.di.IntConfig
-
-import scala.concurrent.{Await, Future, future}
-import scala.concurrent.duration._
-import scala.concurrent.ExecutionContext.Implicits.global
-import scala.util.Try
-import com.yahoo.container.di.config.RestApiContext
+import com.yahoo.config.test.TestConfig
 import com.yahoo.container.bundle.MockBundle
+import com.yahoo.container.di.ContainerTest._
+import com.yahoo.container.di.componentgraph.Provider
+import com.yahoo.container.di.componentgraph.core.ComponentGraphTest.{SimpleComponent, SimpleComponent2}
 import com.yahoo.container.di.componentgraph.core.ComponentNode.ComponentConstructorException
+import com.yahoo.container.di.componentgraph.core.{ComponentGraph, Node}
+import com.yahoo.container.di.config.RestApiContext
+import org.hamcrest.CoreMatchers._
+import org.junit.Assert._
+import org.junit.{After, Before, Ignore, Test}
 
+import scala.collection.JavaConverters._
+import scala.concurrent.ExecutionContext.Implicits.global
+import scala.concurrent.duration._
+import scala.concurrent.{Await, Future}
 import scala.language.postfixOps
+import scala.util.Try
 
 /**
  * @author tonytv
@@ -396,5 +394,5 @@ object ContainerTest {
     componentGraph.getInstance(classOf[ComponentTakingConfig])
   }
 
-  def convertMap[K, V](map: java.util.Map[K, V]): Map[K, V] = JavaConversions.mapAsScalaMap(map).toMap
+  def convertMap[K, V](map: java.util.Map[K, V]): Map[K, V] = map.asScala.toMap
 }