diff options
Diffstat (limited to 'container-di/src/main/scala')
6 files changed, 23 insertions, 18 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 25ec75da5b1..cf047503d71 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 @@ -11,6 +11,7 @@ import com.yahoo.log.LogLevel import com.yahoo.vespa.config.ConfigKey import scala.collection.JavaConverters._ +import scala.language.existentials /** 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 a4d7370429e..ac5f9bb589f 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 @@ -11,6 +11,7 @@ import com.yahoo.log.LogLevel import scala.annotation.tailrec import scala.collection.JavaConverters._ +import scala.language.postfixOps /** * @author tonytv diff --git a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentGraph.scala b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentGraph.scala index 2bae9d67f27..f27dfc54b75 100644 --- a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentGraph.scala +++ b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentGraph.scala @@ -25,6 +25,8 @@ import com.yahoo.container.di.removeStackTrace import scala.util.Try import scala.Some +import scala.language.existentials + /** * @author tonytv * @author gjoranv @@ -177,13 +179,13 @@ class ComponentGraph(val generation: Long = 0) { assert(wildCardType.getLowerBounds.isEmpty) assert(wildCardType.getUpperBounds.size == 1) wildCardType.getUpperBounds.head.asInstanceOf[Class[AnyRef]] - case clazz: Class[AnyRef] => clazz + case clazz: Class[_] => clazz case typeVariable: TypeVariable[_] => throw new RuntimeException("Can't create ComponentRegistry of unknown type variable " + typeVariable) } componentRegistryNodes.find(_.componentClass == componentType). - getOrElse(newComponentRegistryNode(componentClass)) + getOrElse(newComponentRegistryNode(componentClass.asInstanceOf[Class[AnyRef]])) } def handleConfigParameter(node : ComponentNode, clazz: Class[_]) : ConfigKeyT = { diff --git a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/JerseyNode.scala b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/JerseyNode.scala index 92d83f2ecc7..aeae227f4cb 100644 --- a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/JerseyNode.scala +++ b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/JerseyNode.scala @@ -1,18 +1,18 @@ // 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.componentgraph.core -import com.yahoo.component.{ComponentSpecification, ComponentId} +import java.net.URL + +import com.yahoo.component.{ComponentId, ComponentSpecification} +import com.yahoo.container.di.Osgi import com.yahoo.container.di.Osgi.RelativePath +import com.yahoo.container.di.componentgraph.core.JerseyNode._ import com.yahoo.container.di.config.RestApiContext +import com.yahoo.container.di.config.RestApiContext.BundleInfo +import org.osgi.framework.Bundle import org.osgi.framework.wiring.BundleWiring -import scala.collection.JavaConverters._ -import scala.collection.convert.wrapAsJava._ -import RestApiContext.BundleInfo -import JerseyNode._ -import com.yahoo.container.di.Osgi -import org.osgi.framework.Bundle -import java.net.URL +import scala.collection.JavaConverters._ /** * Represents an instance of RestApiContext @@ -70,7 +70,7 @@ object JerseyNode { webInfUrl(bundle), bundle.adapt(classOf[BundleWiring]).getClassLoader) - bundleInfo.setClassEntries(classEntries) + bundleInfo.setClassEntries(classEntries.asJavaCollection) bundleInfo } diff --git a/container-di/src/main/scala/com/yahoo/container/di/osgi/OsgiUtil.scala b/container-di/src/main/scala/com/yahoo/container/di/osgi/OsgiUtil.scala index 8b4be3f5c10..f2120786579 100644 --- a/container-di/src/main/scala/com/yahoo/container/di/osgi/OsgiUtil.scala +++ b/container-di/src/main/scala/com/yahoo/container/di/osgi/OsgiUtil.scala @@ -7,19 +7,17 @@ import java.util.jar.{JarEntry, JarFile} import java.util.logging.{Level, Logger} import java.util.stream.Collectors +import com.google.common.io.Files.fileTreeTraverser import com.yahoo.component.ComponentSpecification import com.yahoo.container.di.Osgi.RelativePath import com.yahoo.vespa.scalalib.arm.Using.using +import com.yahoo.vespa.scalalib.java.function.FunctionConverters._ import com.yahoo.vespa.scalalib.osgi.maven.ProjectBundleClassPaths import com.yahoo.vespa.scalalib.osgi.maven.ProjectBundleClassPaths.BundleClasspathMapping import org.osgi.framework.Bundle import org.osgi.framework.wiring.BundleWiring -import com.google.common.io.Files.fileTreeTraverser - -import scala.collection.convert.decorateAsScala._ - -import com.yahoo.vespa.scalalib.java.function.FunctionConverters._ +import scala.collection.JavaConverters._ /** * Tested by com.yahoo.application.container.jersey.JerseyTest diff --git a/container-di/src/main/scala/com/yahoo/container/di/package.scala b/container-di/src/main/scala/com/yahoo/container/di/package.scala index df7c8359795..e580d928ebb 100644 --- a/container-di/src/main/scala/com/yahoo/container/di/package.scala +++ b/container-di/src/main/scala/com/yahoo/container/di/package.scala @@ -1,10 +1,13 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container -import com.yahoo.config.ConfigInstance -import com.yahoo.vespa.config.ConfigKey import java.lang.reflect.Type + import com.google.inject.Key +import com.yahoo.config.ConfigInstance +import com.yahoo.vespa.config.ConfigKey + +import scala.language.implicitConversions /** * |