diff options
Diffstat (limited to 'container-di')
5 files changed, 49 insertions, 52 deletions
diff --git a/container-di/src/main/scala/com/yahoo/container/di/CloudSubscriberFactory.scala b/container-di/src/main/scala/com/yahoo/container/di/CloudSubscriberFactory.scala index 2e9856fd0c8..25ec75da5b1 100644 --- a/container-di/src/main/scala/com/yahoo/container/di/CloudSubscriberFactory.scala +++ b/container-di/src/main/scala/com/yahoo/container/di/CloudSubscriberFactory.scala @@ -1,16 +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 com.yahoo.config.{ConfigInstance} -import CloudSubscriberFactory._ -import config.{Subscriber, SubscriberFactory} -import scala.collection.JavaConversions._ -import com.yahoo.vespa.config.ConfigKey -import scala.Some -import com.yahoo.config.subscription.{ConfigHandle, ConfigSource, ConfigSourceSet, ConfigSubscriber} -import java.lang.IllegalArgumentException import java.util.logging.Logger + +import com.yahoo.config.ConfigInstance +import com.yahoo.config.subscription.{ConfigHandle, ConfigSource, ConfigSourceSet, ConfigSubscriber} +import com.yahoo.container.di.CloudSubscriberFactory._ +import com.yahoo.container.di.config.{Subscriber, SubscriberFactory} import com.yahoo.log.LogLevel +import com.yahoo.vespa.config.ConfigKey + +import scala.collection.JavaConverters._ /** @@ -24,7 +24,7 @@ class CloudSubscriberFactory(configSource: ConfigSource) extends SubscriberFacto private val activeSubscribers = new java.util.WeakHashMap[CloudSubscriber, Int]() override def getSubscriber(configKeys: java.util.Set[_ <: ConfigKey[_]]): Subscriber = { - val subscriber = new CloudSubscriber(configKeys.toSet.asInstanceOf[Set[ConfigKeyT]], configSource) + val subscriber = new CloudSubscriber(configKeys.asScala.toSet.asInstanceOf[Set[ConfigKeyT]], configSource) testGeneration.foreach(subscriber.subscriber.reload(_)) //TODO: test specific code, remove activeSubscribers.put(subscriber, 0) @@ -36,7 +36,7 @@ class CloudSubscriberFactory(configSource: ConfigSource) extends SubscriberFacto override def reloadActiveSubscribers(generation: Long) { testGeneration = Some(generation) - val l = activeSubscribers.keySet().toSet + val l = activeSubscribers.keySet().asScala.toSet l.foreach { _.subscriber.reload(generation) } } } @@ -59,7 +59,7 @@ object CloudSubscriberFactory { //mapValues returns a view,, so we need to force evaluation of it here to prevent deferred evaluation. override def config = handles.mapValues(_.getConfig).toMap.view.force. - asInstanceOf[Map[ConfigKey[ConfigInstance], ConfigInstance]] + asInstanceOf[Map[ConfigKey[ConfigInstance], ConfigInstance]].asJava override def waitNextGeneration() = { require(!handles.isEmpty) diff --git a/container-di/src/main/scala/com/yahoo/container/di/ConfigRetriever.scala b/container-di/src/main/scala/com/yahoo/container/di/ConfigRetriever.scala index ec857e439f9..a4d7370429e 100644 --- a/container-di/src/main/scala/com/yahoo/container/di/ConfigRetriever.scala +++ b/container-di/src/main/scala/com/yahoo/container/di/ConfigRetriever.scala @@ -2,17 +2,15 @@ package com.yahoo.container.di -import config.Subscriber import java.util.logging.{Level, Logger} -import com.yahoo.log.LogLevel -import ConfigRetriever._ - -import annotation.tailrec import com.yahoo.config.ConfigInstance +import com.yahoo.container.di.ConfigRetriever._ +import com.yahoo.container.di.config.Subscriber +import com.yahoo.log.LogLevel -import scala.collection.JavaConversions._ -import com.yahoo.vespa.config.ConfigKey +import scala.annotation.tailrec +import scala.collection.JavaConverters._ /** * @author tonytv @@ -64,7 +62,7 @@ final class ConfigRetriever(bootstrapKeys: Set[ConfigKeyT], private def configIfChanged[T <: ConfigSnapshot](subscriber: Subscriber, constructor: Map[ConfigKeyT, ConfigInstance] => T ): Option[T] = { - if (subscriber.configChanged) Some(constructor(subscriber.config.toMap)) + if (subscriber.configChanged) Some(constructor(subscriber.config.asScala.toMap)) else None } diff --git a/container-di/src/main/scala/com/yahoo/container/di/Container.scala b/container-di/src/main/scala/com/yahoo/container/di/Container.scala index 550f61c0cf2..af73730afa2 100644 --- a/container-di/src/main/scala/com/yahoo/container/di/Container.scala +++ b/container-di/src/main/scala/com/yahoo/container/di/Container.scala @@ -1,8 +1,8 @@ // 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 java.util.{IdentityHashMap, Random} import java.util.logging.{Level, Logger} +import java.util.{IdentityHashMap, Random} import com.google.inject.{Guice, Injector} import com.yahoo.config._ @@ -17,10 +17,10 @@ import com.yahoo.container.{BundlesConfig, ComponentsConfig} import com.yahoo.protect.Process import com.yahoo.vespa.config.ConfigKey -import scala.collection.JavaConversions._ -import scala.math.max +import scala.collection.JavaConverters._ import scala.concurrent.duration._ import scala.language.postfixOps +import scala.math.max /** @@ -38,7 +38,7 @@ class Container( val bundlesConfigKey = new ConfigKey(classOf[BundlesConfig], configId) val componentsConfigKey = new ConfigKey(classOf[ComponentsConfig], configId) - var configurer = new ConfigRetriever(Set(bundlesConfigKey, componentsConfigKey), subscriberFactory.getSubscriber(_)) + var configurer = new ConfigRetriever(Set(bundlesConfigKey, componentsConfigKey), (keys) => subscriberFactory.getSubscriber(keys.asJava)) var previousConfigGeneration = -1L var leastGeneration = -1L @@ -51,7 +51,7 @@ class Container( val oldComponents = new IdentityHashMap[AnyRef, AnyRef]() oldGraph.allComponentsAndProviders foreach (oldComponents.put(_, null)) newGraph.allComponentsAndProviders foreach (oldComponents.remove(_)) - oldComponents.keySet foreach (componentDeconstructor.deconstruct(_)) + oldComponents.keySet.asScala foreach (componentDeconstructor.deconstruct(_)) } try { @@ -157,8 +157,8 @@ class Container( def injectNodes(config: ComponentsConfig, graph: ComponentGraph) { for { - component <- config.components() - inject <- component.inject() + component <- config.components().asScala + inject <- component.inject().asScala } { def getNode = ComponentGraph.getNode(graph, _: String) @@ -194,7 +194,7 @@ class Container( def isRestApiContext(clazz: Class[_]) = classOf[RestApiContext].isAssignableFrom(clazz) def asRestApiContext(clazz: Class[_]) = clazz.asInstanceOf[Class[RestApiContext]] - for (config : ComponentsConfig.Components <- componentsConfig.components) { + for (config : ComponentsConfig.Components <- componentsConfig.components.asScala) { val specification = bundleInstatiationSpecification(config) val componentClass = osgi.resolveClass(specification) 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 } |