diff --git a/.travis.yml b/.travis.yml index 67b3405..4b989e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: scala scala: - 2.11.8 + - 2.12.8 script: - sbt clean 'project krapsRpc' 'coverage' 'test' 'coverageReport' diff --git a/build.sbt b/build.sbt index cc77da3..fa4b7e9 100644 --- a/build.sbt +++ b/build.sbt @@ -1,13 +1,18 @@ name := "kraps-rpc" -scalaVersion := "2.11.8" +lazy val scala212 = "2.12.8" +lazy val scala211 = "2.11.12" +lazy val supportedScalaVersions = List(scala212, scala211) -lazy val root = (project in file(".")).aggregate(krapsRpc, krapsRpcExample) +lazy val root = (project in file(".")) + .aggregate(krapsRpc, krapsRpcExample) + .settings(crossScalaVersions := Nil, publish / skip := true) lazy val commonSettings = Seq( organization := "neoremind", - version := "1.0.1-SNAPSHOT", - scalaVersion := "2.11.8", + version := "1.0.2-SNAPSHOT", + crossScalaVersions := supportedScalaVersions, + //scalaVersion := "2.12.8", publishMavenStyle := true, organizationName := "neoremind", organizationHomepage := Some(url("http://neoremind.net")), @@ -28,16 +33,17 @@ lazy val krapsRpc = (project in file("kraps-core")) .settings( name := "kraps-core", libraryDependencies ++= Seq( - "org.slf4j" % "slf4j-api" % "1.7.7", - "org.slf4j" % "slf4j-log4j12" % "1.7.7", - "com.google.guava" % "guava" % "15.0", - "org.apache.spark" %% "spark-network-common" % "2.1.0", - "de.ruedigermoeller" % "fst" % "2.50", - "org.scalatest" %% "scalatest" % "2.2.6" % "test", - "org.scalamock" %% "scalamock-scalatest-support" % "3.2.2" % "test", - "org.hamcrest" % "hamcrest-core" % "1.3" % "test", - "org.hamcrest" % "hamcrest-library" % "1.3" % "test", - "junit" % "junit" % "4.11" % "test" + "org.slf4j" % "slf4j-api" % "1.7.7", + "org.slf4j" % "slf4j-log4j12" % "1.7.7", + "com.google.guava" % "guava" % "15.0", + "org.apache.spark" %% "spark-network-common" % "2.4.0", + "org.apache.spark" %% "spark-tags" % "2.4.0", + "de.ruedigermoeller" % "fst" % "2.50", + "org.scalatest" %% "scalatest" % "3.0.6" % "test", + "org.scalamock" %% "scalamock-scalatest-support" % "3.4.1" % "test", + "org.hamcrest" % "hamcrest-core" % "1.3" % "test", + "org.hamcrest" % "hamcrest-library" % "1.3" % "test", + "junit" % "junit" % "4.11" % "test" ) ) diff --git a/kraps-core/pom.xml b/kraps-core/pom.xml deleted file mode 100644 index ed048c3..0000000 --- a/kraps-core/pom.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - 4.0.0 - - - net.neoremind - kraps-rpc-parent_2.11 - ../pom.xml - 1.0.1-SNAPSHOT - - - kraps-rpc_2.11 - 1.0.1-SNAPSHOT - jar - kraps-rpc - A RPC framework leveraging Spark RPC module - - - - - org.apache.spark - spark-network-common_2.11 - - - de.ruedigermoeller - fst - - - - - target/scala-${scala.binary.version}/classes - target/scala-${scala.binary.version}/test-classes - - - ${project.basedir}/src/main/resources - - - - ${project.build.directory}/extra-resources - true - - - - - net.alchim31.maven - scala-maven-plugin - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.scalatest - scalatest-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.maven.plugins - maven-source-plugin - - - org.jacoco - jacoco-maven-plugin - - - timezra.maven - jacoco-scala-maven-plugin - - - org.eluder.coveralls - coveralls-maven-plugin - - - - - diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/RpcConf.scala b/kraps-core/src/main/scala/net/neoremind/kraps/RpcConf.scala similarity index 100% rename from kraps-core/src/main/scala/com/neoremind/kraps/RpcConf.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/RpcConf.scala diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/RpcException.scala b/kraps-core/src/main/scala/net/neoremind/kraps/RpcException.scala similarity index 100% rename from kraps-core/src/main/scala/com/neoremind/kraps/RpcException.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/RpcException.scala diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/RpcAddress.scala b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/RpcAddress.scala similarity index 100% rename from kraps-core/src/main/scala/com/neoremind/kraps/rpc/RpcAddress.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/rpc/RpcAddress.scala diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/RpcCallContext.scala b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/RpcCallContext.scala similarity index 100% rename from kraps-core/src/main/scala/com/neoremind/kraps/rpc/RpcCallContext.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/rpc/RpcCallContext.scala diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/RpcEndpoint.scala b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/RpcEndpoint.scala similarity index 97% rename from kraps-core/src/main/scala/com/neoremind/kraps/rpc/RpcEndpoint.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/rpc/RpcEndpoint.scala index 7c2fd27..bfd2f07 100644 --- a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/RpcEndpoint.scala +++ b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/RpcEndpoint.scala @@ -65,7 +65,7 @@ trait RpcEndpoint { /** * Process messages from [[RpcEndpointRef.send]] or [[RpcCallContext.reply)]]. If receiving a - * unmatched message, [[RpcException]] will be thrown and sent to `onError`. + * unmatched message, [[net.neoremind.kraps.RpcException]] will be thrown and sent to `onError`. */ def receive: PartialFunction[Any, Unit] = { case _ => throw new RpcException(self + " does not implement 'receive'") diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/RpcEndpointAddress.scala b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/RpcEndpointAddress.scala similarity index 100% rename from kraps-core/src/main/scala/com/neoremind/kraps/rpc/RpcEndpointAddress.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/rpc/RpcEndpointAddress.scala diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/RpcEndpointNotFoundException.scala b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/RpcEndpointNotFoundException.scala similarity index 100% rename from kraps-core/src/main/scala/com/neoremind/kraps/rpc/RpcEndpointNotFoundException.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/rpc/RpcEndpointNotFoundException.scala diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/RpcEndpointRef.scala b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/RpcEndpointRef.scala similarity index 100% rename from kraps-core/src/main/scala/com/neoremind/kraps/rpc/RpcEndpointRef.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/rpc/RpcEndpointRef.scala diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/RpcEnv.scala b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/RpcEnv.scala similarity index 100% rename from kraps-core/src/main/scala/com/neoremind/kraps/rpc/RpcEnv.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/rpc/RpcEnv.scala diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/RpcEnvStoppedException.scala b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/RpcEnvStoppedException.scala similarity index 100% rename from kraps-core/src/main/scala/com/neoremind/kraps/rpc/RpcEnvStoppedException.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/rpc/RpcEnvStoppedException.scala diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/RpcTimeout.scala b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/RpcTimeout.scala similarity index 98% rename from kraps-core/src/main/scala/com/neoremind/kraps/rpc/RpcTimeout.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/rpc/RpcTimeout.scala index f4820fd..f6a6337 100644 --- a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/RpcTimeout.scala +++ b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/RpcTimeout.scala @@ -19,12 +19,12 @@ package net.neoremind.kraps.rpc import java.util.concurrent.TimeoutException +import net.neoremind.kraps.util.Utils +import net.neoremind.kraps.{RpcConf, RpcException} + import scala.concurrent.{Await, Future} import scala.concurrent.duration._ import scala.util.control.NonFatal -import net.neoremind.kraps.RpcConf -import net.neoremind.kraps.RpcException -import net.neoremind.kraps.util.Utils /** * An exception thrown if RpcTimeout modifies a [[TimeoutException]]. diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/netty/Dispatcher.scala b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/netty/Dispatcher.scala similarity index 100% rename from kraps-core/src/main/scala/com/neoremind/kraps/rpc/netty/Dispatcher.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/rpc/netty/Dispatcher.scala index ba38be8..9064675 100644 --- a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/netty/Dispatcher.scala +++ b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/netty/Dispatcher.scala @@ -18,8 +18,8 @@ package net.neoremind.kraps.rpc.netty import java.util.concurrent.{ConcurrentHashMap, ConcurrentMap, LinkedBlockingQueue, ThreadPoolExecutor, TimeUnit} -import javax.annotation.concurrent.GuardedBy +import javax.annotation.concurrent.GuardedBy import net.neoremind.kraps.RpcException import net.neoremind.kraps.rpc.{RpcEndpoint, RpcEndpointAddress, RpcEndpointRef, RpcEnvStoppedException} import net.neoremind.kraps.util.ThreadUtils diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/netty/Inbox.scala b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/netty/Inbox.scala similarity index 99% rename from kraps-core/src/main/scala/com/neoremind/kraps/rpc/netty/Inbox.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/rpc/netty/Inbox.scala index 9226a64..c795d80 100644 --- a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/netty/Inbox.scala +++ b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/netty/Inbox.scala @@ -18,7 +18,6 @@ package net.neoremind.kraps.rpc.netty import javax.annotation.concurrent.GuardedBy - import net.neoremind.kraps.RpcException import net.neoremind.kraps.rpc.{RpcAddress, RpcEndpoint, ThreadSafeRpcEndpoint} diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/netty/KrapsTransportConf.scala b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/netty/KrapsTransportConf.scala similarity index 93% rename from kraps-core/src/main/scala/com/neoremind/kraps/rpc/netty/KrapsTransportConf.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/rpc/netty/KrapsTransportConf.scala index 93204cb..57f0d42 100644 --- a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/netty/KrapsTransportConf.scala +++ b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/netty/KrapsTransportConf.scala @@ -17,6 +17,9 @@ package net.neoremind.kraps.rpc.netty +import java.lang +import java.util.Map + import net.neoremind.kraps.RpcConf import org.apache.spark.network.util.{ConfigProvider, TransportConf} @@ -35,7 +38,7 @@ object KrapsTransportConf { /** * Utility for creating a [[KrapsTransportConf]] from a [[net.neoremind.kraps.RpcConf]]. * - * @param conf the [[RpcConf]] + * @param conf the [[net.neoremind.kraps.RpcConf]] * @param module the module name * @param numUsableCores if nonzero, this will restrict the server and client threads to only * use the given number of cores, rather than all of the machine's cores. @@ -51,6 +54,8 @@ object KrapsTransportConf { new TransportConf(module, new ConfigProvider { override def get(name: String): String = conf.get(name) + + override def getAll: lang.Iterable[Map.Entry[String, String]] = ??? //conf.getAll.toMap }) } diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/netty/NettyRpcCallContext.scala b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/netty/NettyRpcCallContext.scala similarity index 100% rename from kraps-core/src/main/scala/com/neoremind/kraps/rpc/netty/NettyRpcCallContext.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/rpc/netty/NettyRpcCallContext.scala diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/netty/NettyRpcEnv.scala b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/netty/NettyRpcEnv.scala similarity index 99% rename from kraps-core/src/main/scala/com/neoremind/kraps/rpc/netty/NettyRpcEnv.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/rpc/netty/NettyRpcEnv.scala index caec62b..6750f32 100644 --- a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/netty/NettyRpcEnv.scala +++ b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/netty/NettyRpcEnv.scala @@ -22,8 +22,8 @@ import java.net.{InetSocketAddress, URI} import java.nio.ByteBuffer import java.util.concurrent._ import java.util.concurrent.atomic.AtomicBoolean -import javax.annotation.Nullable +import javax.annotation.Nullable import net.neoremind.kraps.RpcConf import net.neoremind.kraps.rpc._ import net.neoremind.kraps.serializer.{JavaSerializer, JavaSerializerInstance} @@ -79,7 +79,7 @@ class NettyRpcEnv( private val stopped = new AtomicBoolean(false) /** - * A map for [[RpcAddress]] and [[Outbox]]. When we are connecting to a remote [[RpcAddress]], + * A map for [[net.neoremind.kraps.rpc.RpcAddress]] and [[Outbox]]. When we are connecting to a remote [[RpcAddress]], * we just put messages to its [[Outbox]] to implement a non-blocking `send` method. */ private val outboxes = new ConcurrentHashMap[RpcAddress, Outbox]() diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/netty/Outbox.scala b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/netty/Outbox.scala similarity index 100% rename from kraps-core/src/main/scala/com/neoremind/kraps/rpc/netty/Outbox.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/rpc/netty/Outbox.scala index 3e21f28..64cccc5 100644 --- a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/netty/Outbox.scala +++ b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/netty/Outbox.scala @@ -19,8 +19,8 @@ package net.neoremind.kraps.rpc.netty import java.nio.ByteBuffer import java.util.concurrent.Callable -import javax.annotation.concurrent.GuardedBy +import javax.annotation.concurrent.GuardedBy import net.neoremind.kraps.RpcException import net.neoremind.kraps.rpc.{RpcAddress, RpcEnvStoppedException} import org.apache.spark.network.client.{RpcResponseCallback, TransportClient} diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/netty/RpcEndpointVerifier.scala b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/netty/RpcEndpointVerifier.scala similarity index 93% rename from kraps-core/src/main/scala/com/neoremind/kraps/rpc/netty/RpcEndpointVerifier.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/rpc/netty/RpcEndpointVerifier.scala index 93bbb5a..e9518f0 100644 --- a/kraps-core/src/main/scala/com/neoremind/kraps/rpc/netty/RpcEndpointVerifier.scala +++ b/kraps-core/src/main/scala/net/neoremind/kraps/rpc/netty/RpcEndpointVerifier.scala @@ -23,7 +23,7 @@ import net.neoremind.kraps.rpc.{RpcCallContext, RpcEndpoint, RpcEnv} import net.neoremind.kraps.util.Utils /** - * An [[RpcEndpoint]] for remote [[RpcEnv]]s to query if an `RpcEndpoint` exists. + * An [[net.neoremind.kraps.rpc.RpcEndpoint]] for remote [[net.neoremind.kraps.rpc.RpcEnv]]s to query if an `RpcEndpoint` exists. * * This is used when setting up a remote endpoint reference. */ diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/serializer/JavaSerializer.scala b/kraps-core/src/main/scala/net/neoremind/kraps/serializer/JavaSerializer.scala similarity index 100% rename from kraps-core/src/main/scala/com/neoremind/kraps/serializer/JavaSerializer.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/serializer/JavaSerializer.scala diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/serializer/Serializer.scala b/kraps-core/src/main/scala/net/neoremind/kraps/serializer/Serializer.scala similarity index 100% rename from kraps-core/src/main/scala/com/neoremind/kraps/serializer/Serializer.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/serializer/Serializer.scala index b45afde..22ec838 100644 --- a/kraps-core/src/main/scala/com/neoremind/kraps/serializer/Serializer.scala +++ b/kraps-core/src/main/scala/net/neoremind/kraps/serializer/Serializer.scala @@ -19,8 +19,8 @@ package net.neoremind.kraps.serializer import java.io._ import java.nio.ByteBuffer -import javax.annotation.concurrent.NotThreadSafe +import javax.annotation.concurrent.NotThreadSafe import net.neoremind.kraps.util.NextIterator import scala.reflect.ClassTag diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/util/ByteBufferInputStream.scala b/kraps-core/src/main/scala/net/neoremind/kraps/util/ByteBufferInputStream.scala similarity index 100% rename from kraps-core/src/main/scala/com/neoremind/kraps/util/ByteBufferInputStream.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/util/ByteBufferInputStream.scala diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/util/ByteBufferOutputStream.scala b/kraps-core/src/main/scala/net/neoremind/kraps/util/ByteBufferOutputStream.scala similarity index 100% rename from kraps-core/src/main/scala/com/neoremind/kraps/util/ByteBufferOutputStream.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/util/ByteBufferOutputStream.scala diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/util/NextIterator.scala b/kraps-core/src/main/scala/net/neoremind/kraps/util/NextIterator.scala similarity index 100% rename from kraps-core/src/main/scala/com/neoremind/kraps/util/NextIterator.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/util/NextIterator.scala diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/util/RpcUtils.scala b/kraps-core/src/main/scala/net/neoremind/kraps/util/RpcUtils.scala similarity index 100% rename from kraps-core/src/main/scala/com/neoremind/kraps/util/RpcUtils.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/util/RpcUtils.scala index 524e2c9..7dfbae7 100644 --- a/kraps-core/src/main/scala/com/neoremind/kraps/util/RpcUtils.scala +++ b/kraps-core/src/main/scala/net/neoremind/kraps/util/RpcUtils.scala @@ -17,10 +17,10 @@ package net.neoremind.kraps.util - import net.neoremind.kraps.RpcConf import net.neoremind.kraps.rpc.{RpcAddress, RpcEndpointRef, RpcEnv, RpcTimeout} + object RpcUtils { /** diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/util/ThreadUtils.scala b/kraps-core/src/main/scala/net/neoremind/kraps/util/ThreadUtils.scala similarity index 100% rename from kraps-core/src/main/scala/com/neoremind/kraps/util/ThreadUtils.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/util/ThreadUtils.scala diff --git a/kraps-core/src/main/scala/com/neoremind/kraps/util/Utils.scala b/kraps-core/src/main/scala/net/neoremind/kraps/util/Utils.scala similarity index 100% rename from kraps-core/src/main/scala/com/neoremind/kraps/util/Utils.scala rename to kraps-core/src/main/scala/net/neoremind/kraps/util/Utils.scala index eb3da1b..7182756 100644 --- a/kraps-core/src/main/scala/com/neoremind/kraps/util/Utils.scala +++ b/kraps-core/src/main/scala/net/neoremind/kraps/util/Utils.scala @@ -20,8 +20,8 @@ package net.neoremind.kraps.util import java.io.IOException import java.net.BindException -import net.neoremind.kraps.{RpcConf, RpcException} import io.netty.channel.unix.Errors.NativeIoException +import net.neoremind.kraps.{RpcConf, RpcException} import org.apache.spark.network.util.JavaUtils import org.slf4j.LoggerFactory diff --git a/kraps-core/src/test/scala/com/neoremind/kraps/BaseRpcTest.scala b/kraps-core/src/test/scala/net/neoremind/kraps/BaseRpcTest.scala similarity index 87% rename from kraps-core/src/test/scala/com/neoremind/kraps/BaseRpcTest.scala rename to kraps-core/src/test/scala/net/neoremind/kraps/BaseRpcTest.scala index 20c6059..c497926 100644 --- a/kraps-core/src/test/scala/com/neoremind/kraps/BaseRpcTest.scala +++ b/kraps-core/src/test/scala/net/neoremind/kraps/BaseRpcTest.scala @@ -20,8 +20,8 @@ package net.neoremind.kraps import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.{CountDownLatch, TimeUnit} -import net.neoremind.kraps.rpc._ import net.neoremind.kraps.rpc.netty.NettyRpcEnvFactory +import net.neoremind.kraps.rpc._ import org.scalatest.{BeforeAndAfter, FlatSpec, Matchers} import org.slf4j.LoggerFactory @@ -65,11 +65,20 @@ abstract class BaseRpcTest extends FlatSpec with BeforeAndAfter with Matchers { */ val clientCallWaitTimeInSec = "30s" + val defRpcConf = { + val rpcConf = new RpcConf() + rpcConf.set("spark.rpc.serialization.stream.factory", + "net.neoremind.kraps.serializer.FstSerializationStreamFactory") + rpcConf + } + def runServerAndAwaitTermination(block: => Unit, rpcConf: RpcConf = new RpcConf(), host: String = "localhost", port: Int = _port.get()) = { val future = Future { + rpcConf.set("spark.rpc.serialization.stream.factory", + "net.neoremind.kraps.serializer.FstSerializationStreamFactory") val config = RpcEnvServerConfig(rpcConf, "hello-server", host, port) serverRpcEnv = NettyRpcEnvFactory.create(config) block @@ -78,7 +87,7 @@ abstract class BaseRpcTest extends FlatSpec with BeforeAndAfter with Matchers { } future.onComplete { case scala.util.Success(value) => log.info(s"Shut down server on host=$host, port=" + port) - case scala.util.Failure(e) => log.error(e.getMessage, e) + case scala.util.Failure(e) => log.error(e.getMessage, e) } } @@ -93,7 +102,8 @@ abstract class BaseRpcTest extends FlatSpec with BeforeAndAfter with Matchers { Thread.sleep(200) val config = RpcEnvClientConfig(rpcConf, "test-client") rpcEnv = NettyRpcEnvFactory.create(config) - val endPointRef: RpcEndpointRef = rpcEnv.setupEndpointRef(RpcAddress(host, port), endpointName) + val endPointRef: RpcEndpointRef = + rpcEnv.setupEndpointRef(RpcAddress(host, port), endpointName) log.info(s"created $endPointRef") val future = runBlock(endPointRef) future.onComplete(assertBlock) @@ -118,7 +128,8 @@ abstract class BaseRpcTest extends FlatSpec with BeforeAndAfter with Matchers { startedCountDownLatch.await(serverStartTimeoutInMs, TimeUnit.MILLISECONDS) val config = RpcEnvClientConfig(rpcConf, "test-client") rpcEnv = NettyRpcEnvFactory.create(config) - val endPointRef: RpcEndpointRef = rpcEnv.setupEndpointRef(RpcAddress(host, port), endpointName) + val endPointRef: RpcEndpointRef = + rpcEnv.setupEndpointRef(RpcAddress(host, port), endpointName) log.info(s"created $endPointRef") runBlock(endPointRef) } catch { @@ -130,4 +141,4 @@ abstract class BaseRpcTest extends FlatSpec with BeforeAndAfter with Matchers { if (rpcEnv != null) rpcEnv.shutdown() } } -} \ No newline at end of file +} diff --git a/kraps-core/src/test/scala/com/neoremind/kraps/RpcTest.scala b/kraps-core/src/test/scala/net/neoremind/kraps/RpcTest.scala similarity index 100% rename from kraps-core/src/test/scala/com/neoremind/kraps/RpcTest.scala rename to kraps-core/src/test/scala/net/neoremind/kraps/RpcTest.scala diff --git a/kraps-core/src/test/scala/com/neoremind/kraps/SimpleClientTest.scala b/kraps-core/src/test/scala/net/neoremind/kraps/SimpleClientTest.scala similarity index 95% rename from kraps-core/src/test/scala/com/neoremind/kraps/SimpleClientTest.scala rename to kraps-core/src/test/scala/net/neoremind/kraps/SimpleClientTest.scala index 91d44f0..dfb9298 100644 --- a/kraps-core/src/test/scala/com/neoremind/kraps/SimpleClientTest.scala +++ b/kraps-core/src/test/scala/net/neoremind/kraps/SimpleClientTest.scala @@ -18,7 +18,7 @@ package net.neoremind.kraps import net.neoremind.kraps.rpc.netty.NettyRpcEnvFactory -import net.neoremind.kraps.rpc._ +import net.neoremind.kraps.rpc.{RpcAddress, RpcEndpointRef, RpcEnv, RpcEnvClientConfig} import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.duration.Duration diff --git a/kraps-core/src/test/scala/com/neoremind/kraps/SimpleServer.scala b/kraps-core/src/test/scala/net/neoremind/kraps/SimpleServer.scala similarity index 99% rename from kraps-core/src/test/scala/com/neoremind/kraps/SimpleServer.scala rename to kraps-core/src/test/scala/net/neoremind/kraps/SimpleServer.scala index 5ec5953..512f364 100644 --- a/kraps-core/src/test/scala/com/neoremind/kraps/SimpleServer.scala +++ b/kraps-core/src/test/scala/net/neoremind/kraps/SimpleServer.scala @@ -18,8 +18,9 @@ package net.neoremind.kraps -import net.neoremind.kraps.rpc._ import net.neoremind.kraps.rpc.netty.NettyRpcEnvFactory +import net.neoremind.kraps.rpc._ + import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.{Await, Future} import scala.concurrent.duration.Duration diff --git a/kraps-rpc-example/pom.xml b/kraps-rpc-example/pom.xml deleted file mode 100644 index c610b72..0000000 --- a/kraps-rpc-example/pom.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - 4.0.0 - - - net.neoremind - kraps-rpc-parent_2.11 - ../pom.xml - 1.0.1-SNAPSHOT - - - kraps-rpc-example - 1.0.1-SNAPSHOT - jar - kraps-rpc-example - Example - - - - net.neoremind - kraps-rpc_2.11 - 1.0.1-SNAPSHOT - - - - - target/scala-${scala.binary.version}/classes - target/scala-${scala.binary.version}/test-classes - - - ${project.basedir}/src/main/resources - - - - ${project.build.directory}/extra-resources - true - - - - - net.alchim31.maven - scala-maven-plugin - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.scalatest - scalatest-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.maven.plugins - maven-source-plugin - - - org.jacoco - jacoco-maven-plugin - - - timezra.maven - jacoco-scala-maven-plugin - - - org.eluder.coveralls - coveralls-maven-plugin - - - - - diff --git a/kraps-rpc-example/src/main/scala/HelloworldClient.scala b/kraps-rpc-example/src/main/scala/HelloworldClient.scala index 2003857..cb358b2 100644 --- a/kraps-rpc-example/src/main/scala/HelloworldClient.scala +++ b/kraps-rpc-example/src/main/scala/HelloworldClient.scala @@ -21,7 +21,6 @@ import net.neoremind.kraps.rpc.netty.NettyRpcEnvFactory import scala.concurrent.{Await, Future} import scala.concurrent.duration.Duration - import scala.concurrent.ExecutionContext.Implicits.global /** diff --git a/kraps-rpc-example/src/main/scala/HelloworldServer.scala b/kraps-rpc-example/src/main/scala/HelloworldServer.scala index 318da7d..01bfcf5 100644 --- a/kraps-rpc-example/src/main/scala/HelloworldServer.scala +++ b/kraps-rpc-example/src/main/scala/HelloworldServer.scala @@ -1,3 +1,7 @@ +import net.neoremind.kraps.RpcConf +import net.neoremind.kraps.rpc.{RpcCallContext, RpcEndpoint, RpcEnv, RpcEnvServerConfig} +import net.neoremind.kraps.rpc.netty.NettyRpcEnvFactory + /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,10 +19,6 @@ * limitations under the License. */ -import net.neoremind.kraps.RpcConf -import net.neoremind.kraps.rpc._ -import net.neoremind.kraps.rpc.netty.NettyRpcEnvFactory - /** * Usage: * {{{ diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 353f1dd..0000000 --- a/pom.xml +++ /dev/null @@ -1,407 +0,0 @@ - - - - 4.0.0 - net.neoremind - kraps-rpc-parent_2.11 - 1.0.1-SNAPSHOT - kraps-rpc project parent POM - pom - A RPC framework leveraging Spark RPC module - - - - kraps-core - - - - - UTF-8 - UTF-8 - UTF-8 - 2.11.8 - 1.7 - 1.7 - 1.7 - 4.11 - 2.11.8 - 2.11 - - 64m - 512m - 512m - - - 2017 - - - Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license - - - - - - org.scala-lang - scala-library - ${scala.version} - - - - org.slf4j - slf4j-api - 1.7.7 - - - - org.slf4j - slf4j-log4j12 - 1.7.7 - - - - com.google.guava - guava - 15.0 - - - - - org.scalatest - scalatest_${scala.binary.version} - 2.2.6 - test - - - - org.scalamock - scalamock-scalatest-support_${scala.binary.version} - 3.2.2 - test - - - - org.hamcrest - hamcrest-core - 1.3 - test - - - - org.hamcrest - hamcrest-library - 1.3 - test - - - - junit - junit - ${junit.version} - test - - - - - - - - org.apache.spark - spark-network-common_2.11 - 2.1.0 - - - de.ruedigermoeller - fst - 2.50 - - - - - - src/main/scala - src/test/scala - target/scala-${scala.binary.version}/classes - target/scala-${scala.binary.version}/test-classes - - - ${project.basedir}/src/main/resources - - - - ${project.build.directory}/extra-resources - true - - - - - net.alchim31.maven - scala-maven-plugin - 3.2.2 - - - eclipse-add-source - - add-source - - - - scala-compile-first - process-resources - - compile - - - - scala-test-compile-first - process-test-resources - - testCompile - - - - attach-scaladocs - verify - - doc-jar - - - - - ${scala.version} - incremental - true - - -unchecked - -deprecation - -feature - - - -Xms256m - -Xmx256m - -XX:PermSize=${PermGen} - -XX:MaxPermSize=${MaxPermGen} - -XX:ReservedCodeCacheSize=${CodeCacheSize} - - - -source - ${java.version} - -target - ${java.version} - -Xlint:all,-serial,-path - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7 - - true - - - - - org.scalatest - scalatest-maven-plugin - 1.0 - - ${project.build.directory}/surefire-reports - . - Kraps-rpc_TestSuite.txt - - - - test - - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - true - - - attach-source - - jar - - - - - - org.jacoco - jacoco-maven-plugin - 0.7.2.201409121644 - - - **/metadata/*.class - - - - - prepare-agent - - prepare-agent - - - - post-integration-test - post-integration-test - - report - - - - - - timezra.maven - jacoco-scala-maven-plugin - 0.6.3.1 - - - post-integration-test - post-integration-test - - report - - - - SCALAC.CASE - SCALAC.MIXIN - - - - - - - org.eluder.coveralls - coveralls-maven-plugin - 3.1.0 - - - - - - - tims-repo - http://timezra.github.com/maven/releases - - true - - - false - - - - - - - Xu Zhang - neoremind - xuzh1002@gmail.com - - Developer - - +8 - - - - - neoremind - http://neoremind.com - - - - scm:git:git@github.com:neoremind/kraps-rpc - scm:git:git@github.com:neoremind/kraps-rpc - kraps-rpc-1.0.0 - - - https://github.com/neoremind/kraps-rpc - - - - release - - - nexus-release - https://oss.sonatype.org/content/repositories/snapshots/ - - - nexus-release - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - package - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - package - - jar - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - - - - - - - diff --git a/project/build.properties b/project/build.properties index 133a8f1..7c58a83 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.17 +sbt.version=1.2.6