diff options
| -rw-r--r-- | application/pom.xml | 6 | ||||
| -rw-r--r-- | container-di/pom.xml | 5 | ||||
| -rw-r--r-- | container-di/src/main/scala/com/yahoo/container/di/osgi/OsgiUtil.scala | 16 | ||||
| -rw-r--r-- | maven-plugins/pom.xml | 1 | ||||
| -rw-r--r-- | pom.xml | 1 | ||||
| -rw-r--r-- | scalalib/OWNERS | 1 | ||||
| -rw-r--r-- | scalalib/README | 1 | ||||
| -rw-r--r-- | scalalib/pom.xml | 60 | ||||
| -rw-r--r-- | scalalib/src/main/scala/com/yahoo/vespa/scalalib/arm/Using.scala | 17 | ||||
| -rw-r--r-- | scalalib/src/main/scala/com/yahoo/vespa/scalalib/java/function/FunctionConverters.scala | 20 |
10 files changed, 13 insertions, 115 deletions
diff --git a/application/pom.xml b/application/pom.xml index f58e16a0341..b83c1e92190 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -76,12 +76,6 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>scalalib</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> </dependencies> <build> diff --git a/container-di/pom.xml b/container-di/pom.xml index f6a31ea16a1..86baa0f2081 100644 --- a/container-di/pom.xml +++ b/container-di/pom.xml @@ -50,11 +50,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>scalalib</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-compiler</artifactId> <scope>test</scope> 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 d119f7b0cd4..489760dcbc8 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 @@ -12,8 +12,6 @@ import com.yahoo.component.ComponentSpecification import com.yahoo.container.di.Osgi.RelativePath import com.yahoo.osgi.maven.ProjectBundleClassPaths import com.yahoo.osgi.maven.ProjectBundleClassPaths.BundleClasspathMapping -import com.yahoo.vespa.scalalib.arm.Using.using -import com.yahoo.vespa.scalalib.java.function.FunctionConverters._ import org.osgi.framework.Bundle import org.osgi.framework.wiring.BundleWiring @@ -119,15 +117,27 @@ object OsgiUtil { if (packagePathsToScan.isEmpty) (name: String) => true else (name: String) => packagePathsToScan(packagePath(name)) - using(new JarFile(jarPath.toFile)) { jarFile => + var jarFile: JarFile = null + try { + jarFile = new JarFile(jarPath.toFile) jarFile.stream(). map[String] { entry: JarEntry => entry.getName}. filter { name: String => name.endsWith(classFileTypeSuffix)}. filter(acceptedPackage). collect(Collectors.toList()). asScala + } finally { + if (jarFile != null) jarFile.close() } } def packageToPath(packageName: String) = packageName.replaceAllLiterally(".", "/") + + implicit class JavaPredicate[T](f: T => Boolean) extends Predicate[T] { + override def test(t: T): Boolean = f(t) + } + + implicit class JavaFunction[T, R](f: T => R) extends java.util.function.Function[T, R] { + override def apply(t: T): R = f(t) + } } diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml index 3fdb91adf7f..2f7343e753c 100644 --- a/maven-plugins/pom.xml +++ b/maven-plugins/pom.xml @@ -17,7 +17,6 @@ <modules> <module>../annotations</module> - <module>../scalalib</module> <module>../bundle-plugin</module> <module>../configgen</module> <module>../config-class-plugin</module> @@ -1039,6 +1039,5 @@ <module>vsm</module> <module>yolean</module> <module>zkfacade</module> - <module>scalalib</module> </modules> </project> diff --git a/scalalib/OWNERS b/scalalib/OWNERS deleted file mode 100644 index 3b2ba1ede81..00000000000 --- a/scalalib/OWNERS +++ /dev/null @@ -1 +0,0 @@ -gjoranv diff --git a/scalalib/README b/scalalib/README deleted file mode 100644 index 9c622c66ec0..00000000000 --- a/scalalib/README +++ /dev/null @@ -1 +0,0 @@ -Module for shared Scala utility code in Vespa. diff --git a/scalalib/pom.xml b/scalalib/pom.xml deleted file mode 100644 index d4556d4648b..00000000000 --- a/scalalib/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ -<?xml version="1.0"?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>com.yahoo.vespa</groupId> - <artifactId>parent</artifactId> - <version>6-SNAPSHOT</version> - </parent> - <artifactId>scalalib</artifactId> - <packaging>jar</packaging> - <version>6-SNAPSHOT</version> - <name>${project.artifactId}</name> - <description>Library for use in Scala components of Vespa.</description> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>annotations</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>net.alchim31.maven</groupId> - <artifactId>scala-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>add-source</goal> - <goal>compile</goal> - <goal>testCompile</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>once</forkMode> - <systemPropertyVariables> - <expectedDefaultConfigGenVersion>${project.version}</expectedDefaultConfigGenVersion> - </systemPropertyVariables> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/scalalib/src/main/scala/com/yahoo/vespa/scalalib/arm/Using.scala b/scalalib/src/main/scala/com/yahoo/vespa/scalalib/arm/Using.scala deleted file mode 100644 index bee1172a26f..00000000000 --- a/scalalib/src/main/scala/com/yahoo/vespa/scalalib/arm/Using.scala +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.scalalib.arm - -import scala.language.reflectiveCalls - -/** - * @author tonytv - */ -object Using { - def using[RESOURCE <: { def close() }, RETURN](resource: RESOURCE)(f: RESOURCE => RETURN) = { - try { - f(resource) - } finally { - if (resource != null) resource.close() - } - } -} diff --git a/scalalib/src/main/scala/com/yahoo/vespa/scalalib/java/function/FunctionConverters.scala b/scalalib/src/main/scala/com/yahoo/vespa/scalalib/java/function/FunctionConverters.scala deleted file mode 100644 index b8cce3cf343..00000000000 --- a/scalalib/src/main/scala/com/yahoo/vespa/scalalib/java/function/FunctionConverters.scala +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.scalalib.java.function - -import java.util.function.Predicate - -import scala.language.implicitConversions - -/** - * For using scala functions in Java APIs, such as the stream API. - * @author tonytv - */ -object FunctionConverters { - implicit class JavaPredicate[T](f: T => Boolean) extends Predicate[T] { - override def test(t: T): Boolean = f(t) - } - - implicit class JavaFunction[T, R](f: T => R) extends java.util.function.Function[T, R] { - override def apply(t: T): R = f(t) - } -} |