Remove use of deprecated JavaConversions API

1 files changed, 18 insertions, 21 deletions

diff --git a/config-model/src/test/scala/com/yahoo/vespa/model/container/search/searchchain/FederationSearcherTest.scala b/config-model/src/test/scala/com/yahoo/vespa/model/container/search/searchchain/FederationSearcherTest.scala
index 322b47ad3b5..318e35a2173 100644
--- a/config-model/src/test/scala/com/yahoo/vespa/model/container/search/searchchain/FederationSearcherTest.scala
+++ b/config-model/src/test/scala/com/yahoo/vespa/model/container/search/searchchain/FederationSearcherTest.scala
@@ -1,31 +1,28 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.container.search.searchchain
 
+import java.util.Collections.{emptyList, emptySet}
 import java.util.Optional
 
-import scala.language.implicitConversions
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
-import org.scalatest.FunSuite
-import com.yahoo.search.searchchain.model.federation.{FederationOptions, FederationSearcherModel}
-import com.yahoo.component.{ComponentSpecification, ComponentId}
 import com.yahoo.component.chain.dependencies.Dependencies
-import java.util.Collections.{emptyList, emptySet}
-import com.yahoo.component.provider.ComponentRegistry
-
-import FederationSearcherTest._
 import com.yahoo.component.chain.model.ChainSpecification
-import com.yahoo.search.federation.FederationConfig
+import com.yahoo.component.provider.ComponentRegistry
+import com.yahoo.component.{ComponentId, ComponentSpecification}
 import com.yahoo.config.ConfigInstance
+import com.yahoo.search.federation.FederationConfig
+import com.yahoo.search.searchchain.model.federation.FederationSearcherModel.TargetSpec
+import com.yahoo.search.searchchain.model.federation.{FederationOptions, FederationSearcherModel}
 import com.yahoo.vespa.model.ConfigProducer
-import scala.reflect.ClassTag
-import scala.collection.JavaConversions._
-import scala.collection.breakOut
+import com.yahoo.vespa.model.container.search.searchchain.FederationSearcherTest._
 import com.yahoo.vespa.model.container.search.searchchain.Source.GroupOption
-import com.yahoo.search.federation.sourceref.Target
-import com.yahoo.search.searchchain.model.federation.FederationSearcherModel.TargetSpec
+import org.junit.runner.RunWith
+import org.scalatest.FunSuite
+import org.scalatest.junit.JUnitRunner
 
+import scala.collection.JavaConverters._
+import scala.collection.breakOut
+import scala.language.implicitConversions
+import scala.reflect.ClassTag
 
 /**
  * @author tonytv
@@ -43,7 +40,7 @@ class FederationSearcherTest extends FunSuite{
     }
 
     def registerProviderWithSources(provider: Provider) = {
-      provider :: provider.getSources.toList foreach { chain => searchChainRegistry.register(chain.getId, chain) }
+      provider :: provider.getSources.asScala.toList foreach { chain => searchChainRegistry.register(chain.getId, chain) }
       sourceGroupRegistry.addSources(provider)
     }
   }
@@ -77,7 +74,7 @@ class FederationSearcherTest extends FunSuite{
   }
 
   def toMapByKey[KEY, VALUE](collection: java.util.Collection[VALUE])(f: VALUE => KEY): Map[KEY, VALUE] =
-    collection.map(e => (f(e), e))(breakOut)
+    collection.asScala.map(e => (f(e), e))(breakOut)
 
   test("source groups are inherited when inheritDefaultSources=true") {
     val f = new ProvidersWithSourceFixture
@@ -92,7 +89,7 @@ class FederationSearcherTest extends FunSuite{
 
     //val chainsByProviderId = toMapByKey(target.searchChain())(_.providerId())
 
-    assert(Set("provider1", "provider2") === target.searchChain().map(_.providerId()).toSet)
+    assert(Set("provider1", "provider2") === target.searchChain().asScala.map(_.providerId()).toSet)
   }
 
   test("source groups are not inherited when inheritDefaultSources=false") {
@@ -124,7 +121,7 @@ class FederationSearcherTest extends FunSuite{
 
     registerProviderWithSources(createProvider("provider1"))
     val federation = newFederationSearcher(inheritDefaultSources = true,
-      targets = List(new TargetSpec("provider1", new FederationOptions().setTimeoutInMilliseconds(12345))))
+      targets = List(new TargetSpec("provider1", new FederationOptions().setTimeoutInMilliseconds(12345))).asJava)
 
     initializeFederationSearcher(federation)