diff options
author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-07-11 19:27:43 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-07-13 14:35:25 +0200 |
commit | ebd47ebba08d9d8d06ddb1ee4de5fdeb5ab035bd (patch) | |
tree | 0305583a8cf1294aba5fec4b172cae263fa1db19 /standalone-container | |
parent | 8d13e14a7edad735e89887f1fabb5c919a8dbb2a (diff) |
Remove use of deprecated JavaConversions API
Diffstat (limited to 'standalone-container')
4 files changed, 28 insertions, 28 deletions
diff --git a/standalone-container/src/main/scala/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.scala b/standalone-container/src/main/scala/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.scala index e07957db5a7..02ff2c60ce6 100644 --- a/standalone-container/src/main/scala/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.scala +++ b/standalone-container/src/main/scala/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.scala @@ -1,20 +1,21 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.application.container.impl -import com.yahoo.jdisc.application.{OsgiHeader, OsgiFramework} -import java.util -import org.osgi.framework._ import java.io.InputStream -import util.concurrent.atomic.AtomicInteger -import util.jar.JarFile -import util.{Dictionary, Collections, Hashtable} +import java.net.{URL, URLClassLoader} +import java.util +import java.util.concurrent.atomic.AtomicInteger +import java.util.jar.JarFile +import java.util.{Collections, Dictionary, Hashtable} -import scala.collection.JavaConversions._ import com.yahoo.container.standalone.StandaloneContainerApplication -import collection.mutable.ArrayBuffer -import java.net.{URL, URLClassLoader} +import com.yahoo.jdisc.application.{OsgiFramework, OsgiHeader} +import org.osgi.framework._ import org.osgi.framework.wiring._ -import org.osgi.resource.{Wire, Capability, Requirement} +import org.osgi.resource.{Capability, Requirement, Wire} + +import scala.collection.JavaConverters._ +import scala.collection.mutable.ArrayBuffer /** * A (mock) OSGI implementation which loads classes from the system classpath @@ -55,7 +56,7 @@ final class ClassLoaderOsgiFramework extends OsgiFramework { override def bundleContext():BundleContext = BundleContextImpl - override def bundles() = bundleList + override def bundles() = bundleList.asJava override def start() {} @@ -139,7 +140,7 @@ final class ClassLoaderOsgiFramework extends OsgiFramework { private object SystemBundleImpl extends BundleImpl { override val getBundleId = 0L override def getVersion = Version.emptyVersion - override def getHeaders: Dictionary[String, String] = new Hashtable[String, String](Map(OsgiHeader.APPLICATION -> classOf[StandaloneContainerApplication].getName)) + override def getHeaders: Dictionary[String, String] = new Hashtable[String, String](Map(OsgiHeader.APPLICATION -> classOf[StandaloneContainerApplication].getName).asJava) } @@ -157,7 +158,7 @@ final class ClassLoaderOsgiFramework extends OsgiFramework { val jarFile = new JarFile(location.getFile) try { val attributes = jarFile.getManifest.getMainAttributes - new Hashtable[String, String](attributes.entrySet().map( entry => entry.getKey.toString -> entry.getValue.toString).toMap) + new Hashtable[String, String](attributes.entrySet().asScala.map( entry => entry.getKey.toString -> entry.getValue.toString).toMap.asJava) } finally { jarFile.close() } diff --git a/standalone-container/src/main/scala/com/yahoo/container/standalone/LocalFileDb.scala b/standalone-container/src/main/scala/com/yahoo/container/standalone/LocalFileDb.scala index c237aa25663..69443c73b3a 100644 --- a/standalone-container/src/main/scala/com/yahoo/container/standalone/LocalFileDb.scala +++ b/standalone-container/src/main/scala/com/yahoo/container/standalone/LocalFileDb.scala @@ -3,19 +3,19 @@ package com.yahoo.container.standalone import java.io.File import java.lang.reflect.Constructor +import java.nio.file.Path import java.util import java.util.concurrent.TimeUnit + import com.yahoo.config.FileReference import com.yahoo.config.application.api.FileRegistry import com.yahoo.config.application.api.FileRegistry.Entry +import com.yahoo.container.standalone.LocalFileDb._ import com.yahoo.filedistribution.fileacquirer.FileAcquirer import com.yahoo.net.HostName -import scala.collection.JavaConversions._ - -import LocalFileDb._ +import scala.collection.JavaConverters._ import scala.collection.mutable -import java.nio.file.Path /** @@ -52,11 +52,11 @@ class LocalFileDb(appPath: Path) extends FileAcquirer with FileRegistry { HostName.getLocalhost def allRelativePaths: java.util.Set[String] = { - new java.util.HashSet(fileReferenceToFile.values.map(_.getPath)) + new java.util.HashSet(fileReferenceToFile.values.map(_.getPath).asJavaCollection) } override def export(): util.List[Entry] = { - new java.util.ArrayList(fileReferenceToFile.keys.map{ (ref: FileReference) => new Entry(fileReferenceToFile.get(ref).get.getPath, ref)}) + new java.util.ArrayList(fileReferenceToFile.keys.map{ (ref: FileReference) => new Entry(fileReferenceToFile.get(ref).get.getPath, ref)}.asJavaCollection) } } diff --git a/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala b/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala index 210394dcf88..14187afdaaa 100644 --- a/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala +++ b/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala @@ -29,7 +29,7 @@ import com.yahoo.vespa.model.container.xml.ContainerModelBuilder.Networking import com.yahoo.vespa.model.container.xml.{ConfigServerContainerModelBuilder, ContainerModelBuilder} import org.w3c.dom.Element -import scala.collection.JavaConversions._ +import scala.collection.JavaConverters._ import scala.util.Try /** @@ -210,7 +210,7 @@ object StandaloneContainerApplication { elements map { e => s"${e.getNodeName} id='${e.getAttribute("id")}'" } } - val jDiscElements = ContainerModelBuilder.configModelIds flatMap { name => XML.getChildren(element, name.getName) } + val jDiscElements = ContainerModelBuilder.configModelIds.asScala flatMap { name => XML.getChildren(element, name.getName).asScala } jDiscElements.toList match { case List(e) => e case Nil => throw new RuntimeException("No jdisc element found under services.") @@ -222,7 +222,7 @@ object StandaloneContainerApplication { val element = XmlHelper.getDocument(applicationPackage.getServices).getDocumentElement val nodeName = element.getNodeName - if (ContainerModelBuilder.configModelIds.map(_.getName).contains(nodeName)) element + if (ContainerModelBuilder.configModelIds.asScala.map(_.getName).contains(nodeName)) element else getJDiscInServices(element) } diff --git a/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneSubscriberFactory.scala b/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneSubscriberFactory.scala index 5ae300edc22..47219d2893a 100644 --- a/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneSubscriberFactory.scala +++ b/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneSubscriberFactory.scala @@ -1,15 +1,14 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.standalone -import com.yahoo.config.model.test.MockRoot import com.yahoo.config.{ConfigBuilder, ConfigInstance} import com.yahoo.container.di.ConfigKeyT +import com.yahoo.container.di.config.{Subscriber, SubscriberFactory} +import com.yahoo.container.standalone.StandaloneSubscriberFactory._ +import com.yahoo.vespa.config.ConfigKey import com.yahoo.vespa.model.VespaModel -import scala.collection.JavaConversions._ + import scala.collection.JavaConverters._ -import com.yahoo.vespa.config.ConfigKey -import com.yahoo.container.di.config.{SubscriberFactory, Subscriber} -import StandaloneSubscriberFactory._ /** * @author tonytv @@ -50,7 +49,7 @@ class StandaloneSubscriberFactory(root: VespaModel) extends SubscriberFactory { } override def getSubscriber(configKeys: java.util.Set[_ <: ConfigKey[_]]) = - new StandaloneSubscriber(configKeys.toSet.asInstanceOf[Set[ConfigKeyT]]) + new StandaloneSubscriber(configKeys.asScala.toSet.asInstanceOf[Set[ConfigKeyT]]) def reloadActiveSubscribers(generation: Long) { throw new RuntimeException("unsupported") |