Repository: incubator-gearpump Updated Branches: refs/heads/master db3e8bd1e -> b6f5ccd6e
[GEARPUMP-336] Add scalac options and fix warnings Author: manuzhang <[email protected]> Closes #207 from manuzhang/fix_warnings. Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/b6f5ccd6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/b6f5ccd6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/b6f5ccd6 Branch: refs/heads/master Commit: b6f5ccd6ed0bb70d878c1f786da637ac4597a84f Parents: db3e8bd Author: manuzhang <[email protected]> Authored: Thu Aug 3 20:17:52 2017 +0800 Committer: manuzhang <[email protected]> Committed: Thu Aug 3 20:18:04 2017 +0800 ---------------------------------------------------------------------- .../cluster/appmaster/ApplicationMetaData.scala | 1 - .../cluster/embedded/EmbeddedCluster.scala | 2 - .../org/apache/gearpump/cluster/main/Info.scala | 3 +- .../org/apache/gearpump/cluster/main/Kill.scala | 3 +- .../gearpump/cluster/main/MainRunner.scala | 3 +- .../apache/gearpump/cluster/main/Replay.scala | 3 +- .../gearpump/cluster/master/AppManager.scala | 3 +- .../cluster/master/AppMasterLauncher.scala | 2 +- .../apache/gearpump/cluster/master/Master.scala | 1 - .../gearpump/jarstore/FileDirective.scala | 2 +- .../apache/gearpump/jarstore/FileServer.scala | 4 +- .../scala/org/apache/gearpump/util/Graph.scala | 20 +++---- .../org/apache/gearpump/util/LogUtil.scala | 2 - .../scala/org/apache/gearpump/util/Util.scala | 2 +- .../apache/gearpump/cluster/main/MainSpec.scala | 2 +- .../DistServiceAppMasterSpec.scala | 2 +- .../GearpumpMaterializerSession.scala | 5 +- .../gearpump/akkastream/example/Test8.scala | 2 +- .../gearpump/akkastream/example/Test9.scala | 2 +- .../akkastream/graph/GraphPartitioner.scala | 2 +- .../gearpump/akkastream/graph/SubGraph.scala | 1 - .../materializer/RemoteMaterializerImpl.scala | 4 +- .../experiments/storm/main/GearpumpNimbus.scala | 2 +- .../StormBoltOutputCollectorSpec.scala | 2 - .../StormSpoutOutputCollectorSpec.scala | 2 - .../experiments/yarn/glue/NMClient.scala | 2 +- .../experiments/yarn/glue/RMClient.scala | 2 +- .../hadoop/HadoopCheckpointStoreFactory.scala | 2 - .../gearpump/streaming/kafka/dsl/KafkaDSL.scala | 1 - project/BuildExamples.scala | 17 +++--- project/BuildExperiments.scala | 2 +- project/BuildGearpump.scala | 56 ++++++++++++-------- project/Dependencies.scala | 11 +++- .../gearpump/services/MasterService.scala | 2 +- .../gearpump/services/StaticService.scala | 1 - .../services/AppMasterServiceSpec.scala | 4 +- .../gearpump/services/MasterServiceSpec.scala | 4 +- .../gearpump/streaming/ClusterMessage.scala | 2 - .../gearpump/streaming/StreamApplication.scala | 1 - .../streaming/appmaster/ClockService.scala | 1 - .../streaming/dsl/window/impl/Window.scala | 8 +-- .../streaming/state/api/PersistentTask.scala | 2 - .../state/impl/InMemoryCheckpointStore.scala | 2 - .../transaction/api/CheckpointStore.scala | 2 - .../gearpump/streaming/StreamingTestUtil.scala | 1 - .../streaming/appmaster/AppMasterSpec.scala | 4 +- .../streaming/appmaster/DagManagerSpec.scala | 2 - .../streaming/dsl/task/GroupByTaskSpec.scala | 2 +- .../streaming/dsl/task/TransformTaskSpec.scala | 1 - 49 files changed, 94 insertions(+), 115 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/core/src/main/scala/org/apache/gearpump/cluster/appmaster/ApplicationMetaData.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/gearpump/cluster/appmaster/ApplicationMetaData.scala b/core/src/main/scala/org/apache/gearpump/cluster/appmaster/ApplicationMetaData.scala index b011a0d..bcaf1f0 100644 --- a/core/src/main/scala/org/apache/gearpump/cluster/appmaster/ApplicationMetaData.scala +++ b/core/src/main/scala/org/apache/gearpump/cluster/appmaster/ApplicationMetaData.scala @@ -19,7 +19,6 @@ package org.apache.gearpump.cluster.appmaster import org.apache.gearpump.cluster.{AppDescription, AppJar} -import akka.routing.MurmurHash._ /** * The meta data of an application, which stores the crucial infomation of how to launch http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/core/src/main/scala/org/apache/gearpump/cluster/embedded/EmbeddedCluster.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/gearpump/cluster/embedded/EmbeddedCluster.scala b/core/src/main/scala/org/apache/gearpump/cluster/embedded/EmbeddedCluster.scala index 8abcd96..3fcd569 100644 --- a/core/src/main/scala/org/apache/gearpump/cluster/embedded/EmbeddedCluster.scala +++ b/core/src/main/scala/org/apache/gearpump/cluster/embedded/EmbeddedCluster.scala @@ -24,8 +24,6 @@ import scala.concurrent.duration.Duration import akka.actor.{ActorRef, ActorSystem, Props} import com.typesafe.config.{Config, ConfigValueFactory} import org.apache.gearpump.cluster.ClusterConfig -import org.apache.gearpump.cluster.client.ClientContext -import org.apache.gearpump.cluster.embedded.EmbeddedRuntimeEnvironemnt.EmbeddedClientContext import org.apache.gearpump.cluster.master.{Master => MasterActor} import org.apache.gearpump.cluster.worker.{Worker => WorkerActor} import org.apache.gearpump.util.Constants.{GEARPUMP_CLUSTER_EXECUTOR_WORKER_SHARE_SAME_PROCESS, GEARPUMP_CLUSTER_MASTERS, GEARPUMP_METRIC_ENABLED, MASTER} http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/core/src/main/scala/org/apache/gearpump/cluster/main/Info.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/gearpump/cluster/main/Info.scala b/core/src/main/scala/org/apache/gearpump/cluster/main/Info.scala index e2f8bad..fa2d429 100644 --- a/core/src/main/scala/org/apache/gearpump/cluster/main/Info.scala +++ b/core/src/main/scala/org/apache/gearpump/cluster/main/Info.scala @@ -19,8 +19,7 @@ package org.apache.gearpump.cluster.main import org.apache.gearpump.cluster.MasterToAppMaster.AppMastersData import org.apache.gearpump.cluster.client.ClientContext -import org.apache.gearpump.util.{AkkaApp, LogUtil} -import org.slf4j.Logger +import org.apache.gearpump.util.AkkaApp /** Tool to query master info */ object Info extends AkkaApp with ArgumentsParser { http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/core/src/main/scala/org/apache/gearpump/cluster/main/Kill.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/gearpump/cluster/main/Kill.scala b/core/src/main/scala/org/apache/gearpump/cluster/main/Kill.scala index 4f07707..d5a3520 100644 --- a/core/src/main/scala/org/apache/gearpump/cluster/main/Kill.scala +++ b/core/src/main/scala/org/apache/gearpump/cluster/main/Kill.scala @@ -19,8 +19,7 @@ package org.apache.gearpump.cluster.main import org.apache.gearpump.cluster.client.ClientContext -import org.apache.gearpump.util.{AkkaApp, LogUtil} -import org.slf4j.Logger +import org.apache.gearpump.util.AkkaApp /** Tool to kill an App */ object Kill extends AkkaApp with ArgumentsParser { http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/core/src/main/scala/org/apache/gearpump/cluster/main/MainRunner.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/gearpump/cluster/main/MainRunner.scala b/core/src/main/scala/org/apache/gearpump/cluster/main/MainRunner.scala index 42c2081..11b7239 100644 --- a/core/src/main/scala/org/apache/gearpump/cluster/main/MainRunner.scala +++ b/core/src/main/scala/org/apache/gearpump/cluster/main/MainRunner.scala @@ -18,8 +18,7 @@ package org.apache.gearpump.cluster.main -import org.apache.gearpump.util.{AkkaApp, LogUtil} -import org.slf4j.Logger +import org.apache.gearpump.util.AkkaApp /** Tool to run any main class by providing a jar */ object MainRunner extends AkkaApp with ArgumentsParser { http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/core/src/main/scala/org/apache/gearpump/cluster/main/Replay.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/gearpump/cluster/main/Replay.scala b/core/src/main/scala/org/apache/gearpump/cluster/main/Replay.scala index 03ec899..8c2d7ef 100644 --- a/core/src/main/scala/org/apache/gearpump/cluster/main/Replay.scala +++ b/core/src/main/scala/org/apache/gearpump/cluster/main/Replay.scala @@ -18,8 +18,7 @@ package org.apache.gearpump.cluster.main import org.apache.gearpump.cluster.client.ClientContext -import org.apache.gearpump.util.{AkkaApp, LogUtil} -import org.slf4j.Logger +import org.apache.gearpump.util.AkkaApp // Internal tool to restart an application object Replay extends AkkaApp with ArgumentsParser { http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/core/src/main/scala/org/apache/gearpump/cluster/master/AppManager.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/gearpump/cluster/master/AppManager.scala b/core/src/main/scala/org/apache/gearpump/cluster/master/AppManager.scala index e41a2c5..b00cc17 100644 --- a/core/src/main/scala/org/apache/gearpump/cluster/master/AppManager.scala +++ b/core/src/main/scala/org/apache/gearpump/cluster/master/AppManager.scala @@ -20,7 +20,7 @@ package org.apache.gearpump.cluster.master import akka.actor._ import akka.pattern.ask -import com.typesafe.config.{Config, ConfigFactory} +import com.typesafe.config.ConfigFactory import org.apache.gearpump._ import org.apache.gearpump.cluster.AppMasterToMaster.{AppDataSaved, SaveAppDataFailed, _} import org.apache.gearpump.cluster.AppMasterToWorker._ @@ -38,7 +38,6 @@ import org.apache.gearpump.util.{ActorUtil, TimeOutScheduler, Util, _} import org.slf4j.Logger import scala.concurrent.Future -import scala.concurrent.duration._ import scala.util.{Failure, Success} /** http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/core/src/main/scala/org/apache/gearpump/cluster/master/AppMasterLauncher.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/gearpump/cluster/master/AppMasterLauncher.scala b/core/src/main/scala/org/apache/gearpump/cluster/master/AppMasterLauncher.scala index 2d79558..d791a10 100644 --- a/core/src/main/scala/org/apache/gearpump/cluster/master/AppMasterLauncher.scala +++ b/core/src/main/scala/org/apache/gearpump/cluster/master/AppMasterLauncher.scala @@ -34,7 +34,7 @@ import org.apache.gearpump.cluster.AppMasterToWorker.{LaunchExecutor, ShutdownEx import org.apache.gearpump.cluster.MasterToAppMaster.ResourceAllocated import org.apache.gearpump.cluster.MasterToClient.SubmitApplicationResult import org.apache.gearpump.cluster.WorkerToAppMaster.ExecutorLaunchRejected -import org.apache.gearpump.cluster.appmaster.{AppMasterRuntimeEnvironment, ApplicationRuntimeInfo, WorkerInfo} +import org.apache.gearpump.cluster.appmaster.{AppMasterRuntimeEnvironment, WorkerInfo} import org.apache.gearpump.cluster.scheduler.{Resource, ResourceAllocation, ResourceRequest} import org.apache.gearpump.cluster.{AppDescription, AppJar, _} import org.apache.gearpump.transport.HostPort http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/core/src/main/scala/org/apache/gearpump/cluster/master/Master.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/gearpump/cluster/master/Master.scala b/core/src/main/scala/org/apache/gearpump/cluster/master/Master.scala index 8da417e..68a12d1 100644 --- a/core/src/main/scala/org/apache/gearpump/cluster/master/Master.scala +++ b/core/src/main/scala/org/apache/gearpump/cluster/master/Master.scala @@ -22,7 +22,6 @@ import java.lang.management.ManagementFactory import org.apache.gearpump.cluster.worker.WorkerId import org.apache.gearpump.jarstore.JarStoreServer -import scala.collection.JavaConverters._ import scala.collection.immutable import akka.actor._ http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/core/src/main/scala/org/apache/gearpump/jarstore/FileDirective.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/gearpump/jarstore/FileDirective.scala b/core/src/main/scala/org/apache/gearpump/jarstore/FileDirective.scala index 969da04..d45e102 100644 --- a/core/src/main/scala/org/apache/gearpump/jarstore/FileDirective.scala +++ b/core/src/main/scala/org/apache/gearpump/jarstore/FileDirective.scala @@ -146,7 +146,7 @@ object FileDirective { if (p.filename.isDefined) { val targetPath = File.createTempFile(s"userfile_${p.name}_", s"${p.filename.getOrElse("")}") - val writtenFuture = p.entity.dataBytes.runWith(FileIO.toFile(targetPath)) + val writtenFuture = p.entity.dataBytes.runWith(FileIO.toPath(targetPath.toPath)) writtenFuture.map(written => if (written.count > 0) { Map(p.name -> Left(FileInfo(p.filename.get, targetPath, written.count))) http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/core/src/main/scala/org/apache/gearpump/jarstore/FileServer.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/gearpump/jarstore/FileServer.scala b/core/src/main/scala/org/apache/gearpump/jarstore/FileServer.scala index 4ce8f2d..8c1d19a 100644 --- a/core/src/main/scala/org/apache/gearpump/jarstore/FileServer.scala +++ b/core/src/main/scala/org/apache/gearpump/jarstore/FileServer.scala @@ -139,14 +139,14 @@ object FileServer { // Download file to local val response = Source.single(HttpRequest(uri = download)).via(httpClient).runWith(Sink.head) val downloaded = response.flatMap { response => - response.entity.dataBytes.runWith(FileIO.toFile(saveAs)) + response.entity.dataBytes.runWith(FileIO.toPath(saveAs.toPath)) } downloaded.map(written => Unit) } private def entity(file: File)(implicit ec: ExecutionContext): Future[RequestEntity] = { val entity = HttpEntity(MediaTypes.`application/octet-stream`, file.length(), - FileIO.fromFile(file, chunkSize = 100000)) + FileIO.fromPath(file.toPath, chunkSize = 100000)) val body = Source.single( Multipart.FormData.BodyPart( "uploadfile", http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/core/src/main/scala/org/apache/gearpump/util/Graph.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/gearpump/util/Graph.scala b/core/src/main/scala/org/apache/gearpump/util/Graph.scala index 609b133..f110f5f 100644 --- a/core/src/main/scala/org/apache/gearpump/util/Graph.scala +++ b/core/src/main/scala/org/apache/gearpump/util/Graph.scala @@ -449,15 +449,15 @@ object Graph { new Path(path :+ Right(edge)) } - def ~>[Node >: N](node: Node): Path[Node, E] = { + def ~>[NodeT >: N](node: NodeT): Path[NodeT, E] = { new Path(path :+ Left(node)) } - def to[Node >: N, Edge >: E](node: Node, edge: Edge): Path[Node, Edge] = { + def to[NodeT >: N, EdgeT >: E](node: NodeT, edge: EdgeT): Path[NodeT, EdgeT] = { this ~ edge ~> node } - private[Graph] def updategraph[Node >: N, Edge >: E](graph: Graph[Node, Edge]): Unit = { + private[Graph] def updategraph[NodeT >: N, EdgeT >: E](graph: Graph[NodeT, EdgeT]): Unit = { val nodeEdgePair: Tuple2[Option[N], Option[E]] = (None, None) path.foldLeft(nodeEdgePair) { (pair, either) => val (lastNode, lastEdge) = pair @@ -465,7 +465,7 @@ object Graph { case Left(node) => graph.addVertex(node) if (lastNode.isDefined) { - graph.addEdge(lastNode.get, lastEdge.getOrElse(null.asInstanceOf[Edge]), node) + graph.addEdge(lastNode.get, lastEdge.getOrElse(null.asInstanceOf[EdgeT]), node) } (Some(node), None) case Right(edge) => @@ -481,29 +481,29 @@ object Graph { implicit class Node[N, E](self: N) extends Path[N, E](List(Left(self))) { - override def ~[Edge](edge: Edge): Path[N, Edge] = { + override def ~[EdgeT](edge: EdgeT): Path[N, EdgeT] = { new Path(List(Left(self), Right(edge))) } - override def ~>[Node >: N](node: Node): Path[Node, E] = { + override def ~>[NodeT >: N](node: NodeT): Path[NodeT, E] = { new NodeList(List(self, node)) } - override def to[Node >: N, Edge >: E](node: Node, edge: Edge): Path[Node, Edge] = { + override def to[NodeT >: N, EdgeT >: E](node: NodeT, edge: EdgeT): Path[NodeT, EdgeT] = { this ~ edge ~> node } } class NodeList[N, E](nodes: List[N]) extends Path[N, E](nodes.map(Left(_))) { - override def ~[Edge](edge: Edge): Path[N, Edge] = { + override def ~[EdgeT](edge: EdgeT): Path[N, EdgeT] = { new Path(nodes.map(Left(_)) :+ Right(edge)) } - override def ~>[Node >: N](node: Node): Path[Node, E] = { + override def ~>[NodeT >: N](node: NodeT): Path[NodeT, E] = { new NodeList(nodes :+ node) } - override def to[Node >: N, Edge >: E](node: Node, edge: Edge): Path[Node, Edge] = { + override def to[NodeT >: N, EdgeT >: E](node: NodeT, edge: EdgeT): Path[NodeT, EdgeT] = { this ~ edge ~> node } } http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/core/src/main/scala/org/apache/gearpump/util/LogUtil.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/gearpump/util/LogUtil.scala b/core/src/main/scala/org/apache/gearpump/util/LogUtil.scala index 44cb87f..98850a8 100644 --- a/core/src/main/scala/org/apache/gearpump/util/LogUtil.scala +++ b/core/src/main/scala/org/apache/gearpump/util/LogUtil.scala @@ -19,9 +19,7 @@ package org.apache.gearpump.util import java.io.File -import java.net.InetAddress import java.util.Properties -import scala.util.Try import com.typesafe.config.Config import org.apache.log4j.PropertyConfigurator http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/core/src/main/scala/org/apache/gearpump/util/Util.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/gearpump/util/Util.scala b/core/src/main/scala/org/apache/gearpump/util/Util.scala index fe4b540..2763fd2 100644 --- a/core/src/main/scala/org/apache/gearpump/util/Util.scala +++ b/core/src/main/scala/org/apache/gearpump/util/Util.scala @@ -27,7 +27,7 @@ import scala.util.{Failure, Success, Try} import com.typesafe.config.{Config, ConfigFactory} import org.apache.gearpump.cluster.AppJar -import org.apache.gearpump.jarstore.{JarStoreClient, JarStoreServer} +import org.apache.gearpump.jarstore.JarStoreClient import org.apache.gearpump.transport.HostPort object Util { http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/core/src/test/scala/org/apache/gearpump/cluster/main/MainSpec.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/org/apache/gearpump/cluster/main/MainSpec.scala b/core/src/test/scala/org/apache/gearpump/cluster/main/MainSpec.scala index 29fcd26..554d9c3 100644 --- a/core/src/test/scala/org/apache/gearpump/cluster/main/MainSpec.scala +++ b/core/src/test/scala/org/apache/gearpump/cluster/main/MainSpec.scala @@ -35,7 +35,7 @@ import org.apache.gearpump.util.{Constants, LogUtil, Util} import org.scalatest._ import scala.concurrent.Future -import scala.util.{Success, Try} +import scala.util.Success class MainSpec extends FlatSpec with Matchers with BeforeAndAfterEach with MasterHarness { http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/examples/distributeservice/src/test/scala/org/apache/gearpump/experiments/distributeservice/DistServiceAppMasterSpec.scala ---------------------------------------------------------------------- diff --git a/examples/distributeservice/src/test/scala/org/apache/gearpump/experiments/distributeservice/DistServiceAppMasterSpec.scala b/examples/distributeservice/src/test/scala/org/apache/gearpump/experiments/distributeservice/DistServiceAppMasterSpec.scala index b78bfc2..741a883 100644 --- a/examples/distributeservice/src/test/scala/org/apache/gearpump/experiments/distributeservice/DistServiceAppMasterSpec.scala +++ b/examples/distributeservice/src/test/scala/org/apache/gearpump/experiments/distributeservice/DistServiceAppMasterSpec.scala @@ -27,7 +27,7 @@ import org.scalatest.{BeforeAndAfter, Matchers, WordSpec} import org.apache.gearpump.cluster.AppMasterToMaster.{GetAllWorkers, RegisterAppMaster, RequestResource} import org.apache.gearpump.cluster.AppMasterToWorker.LaunchExecutor import org.apache.gearpump.cluster.MasterToAppMaster.{AppMasterRegistered, ResourceAllocated, WorkerList} -import org.apache.gearpump.cluster.appmaster.{AppMasterRuntimeEnvironment, ApplicationRuntimeInfo} +import org.apache.gearpump.cluster.appmaster.AppMasterRuntimeEnvironment import org.apache.gearpump.cluster.scheduler.{Relaxation, Resource, ResourceAllocation, ResourceRequest} import org.apache.gearpump.cluster.worker.WorkerId import org.apache.gearpump.cluster.{AppDescription, AppMasterContext, TestUtil, UserConfig} http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/GearpumpMaterializerSession.scala ---------------------------------------------------------------------- diff --git a/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/GearpumpMaterializerSession.scala b/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/GearpumpMaterializerSession.scala index 8a869d2..afe7d33 100644 --- a/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/GearpumpMaterializerSession.scala +++ b/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/GearpumpMaterializerSession.scala @@ -69,9 +69,10 @@ class GearpumpMaterializerSession(system: ActorSystem, topLevel: Module, enterScope(copied) materializedValues.put(copied, materializeModule(copied, currentAttributes)) exitScope(copied) - case composite => + case composite: CompositeModule => materializedValues.put(composite, materializeComposite(composite, currentAttributes)) - case EmptyModule => + case _ => + // ignore other modules } } http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/example/Test8.scala ---------------------------------------------------------------------- diff --git a/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/example/Test8.scala b/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/example/Test8.scala index ad2ac61..e87752d 100644 --- a/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/example/Test8.scala +++ b/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/example/Test8.scala @@ -20,7 +20,7 @@ package org.apache.gearpump.akkastream.example import akka.NotUsed import akka.actor.ActorSystem -import akka.stream.{ActorMaterializer, ActorMaterializerSettings, Materializer} +import akka.stream.{ActorMaterializer, ActorMaterializerSettings} import akka.stream.scaladsl._ import org.apache.gearpump.akkastream.GearpumpMaterializer import org.apache.gearpump.cluster.main.{ArgumentsParser, CLIOption} http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/example/Test9.scala ---------------------------------------------------------------------- diff --git a/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/example/Test9.scala b/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/example/Test9.scala index 66414e0..25c7071 100644 --- a/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/example/Test9.scala +++ b/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/example/Test9.scala @@ -26,7 +26,7 @@ import org.apache.gearpump.akkastream.GearpumpMaterializer import org.apache.gearpump.cluster.main.{ArgumentsParser, CLIOption} import org.apache.gearpump.util.AkkaApp -import scala.concurrent.{Await, Future} +import scala.concurrent.Await import scala.concurrent.duration._ /** http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/graph/GraphPartitioner.scala ---------------------------------------------------------------------- diff --git a/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/graph/GraphPartitioner.scala b/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/graph/GraphPartitioner.scala index f7919c0..d764331 100644 --- a/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/graph/GraphPartitioner.scala +++ b/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/graph/GraphPartitioner.scala @@ -26,7 +26,7 @@ import org.apache.gearpump.akkastream.graph.GraphPartitioner.Strategy import org.apache.gearpump.akkastream.module._ import akka.stream.impl.StreamLayout.Module import akka.stream.impl.fusing.GraphStageModule -import akka.stream.impl.fusing.GraphStages.{MaterializedValueSource, SimpleLinearGraphStage, SingleSource} +import akka.stream.impl.fusing.GraphStages.{MaterializedValueSource, SingleSource} import akka.stream.impl.{SinkModule, SourceModule} import org.apache.gearpump.util.Graph http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/graph/SubGraph.scala ---------------------------------------------------------------------- diff --git a/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/graph/SubGraph.scala b/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/graph/SubGraph.scala index a74143e..494be45 100644 --- a/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/graph/SubGraph.scala +++ b/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/graph/SubGraph.scala @@ -18,7 +18,6 @@ package org.apache.gearpump.akkastream.graph -import akka.actor.ActorSystem import org.apache.gearpump.akkastream.GearpumpMaterializer.Edge import akka.stream.impl.StreamLayout.Module import org.apache.gearpump.util.Graph http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/materializer/RemoteMaterializerImpl.scala ---------------------------------------------------------------------- diff --git a/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/materializer/RemoteMaterializerImpl.scala b/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/materializer/RemoteMaterializerImpl.scala index e2cdbd4..a62b8e3 100644 --- a/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/materializer/RemoteMaterializerImpl.scala +++ b/experiments/akkastream/src/main/scala/org/apache/gearpump/akkastream/materializer/RemoteMaterializerImpl.scala @@ -161,7 +161,7 @@ class RemoteMaterializerImpl(graph: Graph[Module, Edge], system: ActorSystem) { ProcessorOp(processor.processor, parallelism, updatedConf, "source") case sinkBridge: SinkBridgeModule[_, _] => ProcessorOp(classOf[SinkBridgeTask], parallelism, conf, "sink") - case groupBy: GroupByModule[Any, Any] => + case groupBy: GroupByModule[_, _] => GroupByOp(groupBy.groupBy, parallelism, "groupBy", conf) case reduce: ReduceModule[_] => reduceOp(reduce.f, conf) @@ -238,7 +238,7 @@ class RemoteMaterializerImpl(graph: Graph[Module, Edge], system: ActorSystem) { val foldConf = conf.withValue(FoldTask.ZERO, fold.zero.asInstanceOf[AnyRef]). withValue(FoldTask.AGGREGATOR, fold.f) ProcessorOp(classOf[FoldTask[_, _]], parallelism, foldConf, "fold") - case groupBy: GroupBy[Any, Any] => + case groupBy: GroupBy[_, _] => GroupByOp(groupBy.keyFor, groupBy.maxSubstreams, "groupBy", conf) case groupedWithin: GroupedWithin[_] => val diConf = conf.withValue[FiniteDuration](GroupedWithinTask.TIME_WINDOW, groupedWithin.d). http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/experiments/storm/src/main/scala/org/apache/gearpump/experiments/storm/main/GearpumpNimbus.scala ---------------------------------------------------------------------- diff --git a/experiments/storm/src/main/scala/org/apache/gearpump/experiments/storm/main/GearpumpNimbus.scala b/experiments/storm/src/main/scala/org/apache/gearpump/experiments/storm/main/GearpumpNimbus.scala index 987546c..4a438d7 100644 --- a/experiments/storm/src/main/scala/org/apache/gearpump/experiments/storm/main/GearpumpNimbus.scala +++ b/experiments/storm/src/main/scala/org/apache/gearpump/experiments/storm/main/GearpumpNimbus.scala @@ -37,7 +37,7 @@ import org.apache.storm.shade.org.yaml.snakeyaml.Yaml import org.slf4j.Logger import org.apache.gearpump.cluster.client.ClientContext import org.apache.gearpump.cluster.main.{ArgumentsParser, CLIOption} -import org.apache.gearpump.cluster.{ApplicationStatus, MasterToAppMaster, UserConfig} +import org.apache.gearpump.cluster.{ApplicationStatus, UserConfig} import org.apache.gearpump.experiments.storm.topology.GearpumpStormTopology import org.apache.gearpump.experiments.storm.util.TimeCacheMapWrapper.Callback import org.apache.gearpump.experiments.storm.util.{GraphBuilder, StormConstants, StormUtil, TimeCacheMapWrapper} http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/experiments/storm/src/test/scala/org/apache/gearpump/experiments/storm/processor/StormBoltOutputCollectorSpec.scala ---------------------------------------------------------------------- diff --git a/experiments/storm/src/test/scala/org/apache/gearpump/experiments/storm/processor/StormBoltOutputCollectorSpec.scala b/experiments/storm/src/test/scala/org/apache/gearpump/experiments/storm/processor/StormBoltOutputCollectorSpec.scala index 430b1c0..2fe124d 100644 --- a/experiments/storm/src/test/scala/org/apache/gearpump/experiments/storm/processor/StormBoltOutputCollectorSpec.scala +++ b/experiments/storm/src/test/scala/org/apache/gearpump/experiments/storm/processor/StormBoltOutputCollectorSpec.scala @@ -18,8 +18,6 @@ package org.apache.gearpump.experiments.storm.processor -import java.util.{List => JList} - import backtype.storm.tuple.Tuple import backtype.storm.utils.Utils import org.apache.gearpump.experiments.storm.util.StormOutputCollector http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/experiments/storm/src/test/scala/org/apache/gearpump/experiments/storm/producer/StormSpoutOutputCollectorSpec.scala ---------------------------------------------------------------------- diff --git a/experiments/storm/src/test/scala/org/apache/gearpump/experiments/storm/producer/StormSpoutOutputCollectorSpec.scala b/experiments/storm/src/test/scala/org/apache/gearpump/experiments/storm/producer/StormSpoutOutputCollectorSpec.scala index 49afe05..8faf7d2 100644 --- a/experiments/storm/src/test/scala/org/apache/gearpump/experiments/storm/producer/StormSpoutOutputCollectorSpec.scala +++ b/experiments/storm/src/test/scala/org/apache/gearpump/experiments/storm/producer/StormSpoutOutputCollectorSpec.scala @@ -18,8 +18,6 @@ package org.apache.gearpump.experiments.storm.producer -import java.util.{List => JList} - import backtype.storm.spout.ISpout import backtype.storm.utils.Utils import org.apache.gearpump.experiments.storm.util.StormOutputCollector http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/glue/NMClient.scala ---------------------------------------------------------------------- diff --git a/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/glue/NMClient.scala b/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/glue/NMClient.scala index 59f3832..810b557 100644 --- a/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/glue/NMClient.scala +++ b/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/glue/NMClient.scala @@ -25,7 +25,7 @@ import com.typesafe.config.Config import org.apache.gearpump.experiments.yarn.appmaster.YarnAppMaster.ContainerStarted import org.apache.gearpump.experiments.yarn.glue.Records._ import org.apache.gearpump.util.LogUtil -import org.apache.hadoop.yarn.api.records.{ApplicationId => YarnApplicationId, ApplicationReport => YarnApplicationReport, Container => YarnContainer, ContainerId => YarnContainerId, ContainerStatus => YarnContainerStatus, NodeId => YarnNodeId, Resource => YarnResource} +import org.apache.hadoop.yarn.api.records.{ContainerId => YarnContainerId, ContainerStatus => YarnContainerStatus} import org.apache.hadoop.yarn.client.api.async.NMClientAsync import org.apache.hadoop.yarn.client.api.async.impl.NMClientAsyncImpl /** http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/glue/RMClient.scala ---------------------------------------------------------------------- diff --git a/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/glue/RMClient.scala b/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/glue/RMClient.scala index 629e233..0625b2d 100644 --- a/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/glue/RMClient.scala +++ b/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/glue/RMClient.scala @@ -22,7 +22,7 @@ import akka.actor.ActorRef import org.apache.gearpump.experiments.yarn.appmaster.YarnAppMaster.{AppMasterRegistered, ContainersAllocated, ContainersCompleted, ResourceManagerException, ShutdownApplication} import org.apache.gearpump.experiments.yarn.glue.Records._ import org.apache.gearpump.util.LogUtil -import org.apache.hadoop.yarn.api.records.{ApplicationId => YarnApplicationId, ApplicationReport => YarnApplicationReport, Container => YarnContainer, ContainerId => YarnContainerId, ContainerStatus => YarnContainerStatus, FinalApplicationStatus, NodeId => YarnNodeId, NodeReport, Priority, Resource => YarnResource} +import org.apache.hadoop.yarn.api.records.{Container => YarnContainer, ContainerId => YarnContainerId, ContainerStatus => YarnContainerStatus, FinalApplicationStatus, NodeReport, Priority} import org.apache.hadoop.yarn.client.api.AMRMClient.ContainerRequest import org.apache.hadoop.yarn.client.api.async.AMRMClientAsync import org.slf4j.Logger http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/external/hadoopfs/src/main/scala/org/apache/gearpump/streaming/hadoop/HadoopCheckpointStoreFactory.scala ---------------------------------------------------------------------- diff --git a/external/hadoopfs/src/main/scala/org/apache/gearpump/streaming/hadoop/HadoopCheckpointStoreFactory.scala b/external/hadoopfs/src/main/scala/org/apache/gearpump/streaming/hadoop/HadoopCheckpointStoreFactory.scala index acc2438..4068413 100644 --- a/external/hadoopfs/src/main/scala/org/apache/gearpump/streaming/hadoop/HadoopCheckpointStoreFactory.scala +++ b/external/hadoopfs/src/main/scala/org/apache/gearpump/streaming/hadoop/HadoopCheckpointStoreFactory.scala @@ -23,10 +23,8 @@ import java.io.{ObjectInputStream, ObjectOutputStream} import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.Path -import org.apache.gearpump.cluster.UserConfig import org.apache.gearpump.streaming.hadoop.lib.HadoopUtil import org.apache.gearpump.streaming.hadoop.lib.rotation.{FileSizeRotation, Rotation} -import org.apache.gearpump.streaming.task.TaskContext import org.apache.gearpump.streaming.transaction.api.{CheckpointStore, CheckpointStoreFactory} object HadoopCheckpointStoreFactory { http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/external/kafka/src/main/scala/org/apache/gearpump/streaming/kafka/dsl/KafkaDSL.scala ---------------------------------------------------------------------- diff --git a/external/kafka/src/main/scala/org/apache/gearpump/streaming/kafka/dsl/KafkaDSL.scala b/external/kafka/src/main/scala/org/apache/gearpump/streaming/kafka/dsl/KafkaDSL.scala index 996ae0b..391cd42 100644 --- a/external/kafka/src/main/scala/org/apache/gearpump/streaming/kafka/dsl/KafkaDSL.scala +++ b/external/kafka/src/main/scala/org/apache/gearpump/streaming/kafka/dsl/KafkaDSL.scala @@ -20,7 +20,6 @@ package org.apache.gearpump.streaming.kafka.dsl import java.util.Properties import org.apache.gearpump.cluster.UserConfig -import org.apache.gearpump.streaming.dsl import org.apache.gearpump.streaming.dsl.scalaapi.{Stream, StreamApp} import org.apache.gearpump.streaming.kafka.{KafkaSink, KafkaSource} import org.apache.gearpump.streaming.transaction.api.CheckpointStoreFactory http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/project/BuildExamples.scala ---------------------------------------------------------------------- diff --git a/project/BuildExamples.scala b/project/BuildExamples.scala index afb7459..b3a8e4a 100644 --- a/project/BuildExamples.scala +++ b/project/BuildExamples.scala @@ -106,7 +106,7 @@ object BuildExamples extends sbt.Build { "commons-io" % "commons-io" % commonsIOVersion, "io.spray" %% "spray-can" % sprayVersion, "io.spray" %% "spray-routing-shapeless2" % sprayVersion - ) + ) ++ annotationDependencies ) ++ include("examples/distributeservice") ).dependsOn(core % "provided; test->test") @@ -160,11 +160,12 @@ object BuildExamples extends sbt.Build { CrossVersion.binaryScalaVersion(scalaVersion.value) ) - private def include(files: String*): Seq[Def.Setting[_]] = Seq( - assemblyExcludedJars in assembly := { - val cp = (fullClasspath in assembly).value - cp.filterNot(p => - files.exists(p.data.getAbsolutePath.contains)) - } - ) + private def include(files: String*): Seq[Def.Setting[_]] = + Seq( + assemblyExcludedJars in assembly := { + val cp = (fullClasspath in assembly).value + cp.filterNot(p => + files.exists(p.data.getAbsolutePath.contains)) + } + ) } http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/project/BuildExperiments.scala ---------------------------------------------------------------------- diff --git a/project/BuildExperiments.scala b/project/BuildExperiments.scala index 4022e95..59c95f7 100644 --- a/project/BuildExperiments.scala +++ b/project/BuildExperiments.scala @@ -60,7 +60,7 @@ object BuildExperiments extends sbt.Build { libraryDependencies ++= Seq( "org.json4s" %% "json4s-jackson" % "3.2.11", "com.typesafe.akka" %% "akka-stream" % akkaVersion - ), + ) ++ annotationDependencies, mainClass in(Compile, packageBin) := Some("akka.stream.gearpump.example.Test") )) .dependsOn (core % "provided", streaming % "test->test; provided") http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/project/BuildGearpump.scala ---------------------------------------------------------------------- diff --git a/project/BuildGearpump.scala b/project/BuildGearpump.scala index 895c042..6c2acad 100644 --- a/project/BuildGearpump.scala +++ b/project/BuildGearpump.scala @@ -54,7 +54,17 @@ object BuildGearpump extends sbt.Build { useGpg := false, pgpSecretRing := file("./secring.asc"), pgpPublicRing := file("./pubring.asc"), - scalacOptions ++= Seq("-Yclosure-elim", "-Yinline"), + scalacOptions ++= Seq( + "-deprecation", // Emit warning and location for usages of deprecated APIs + "-encoding", "UTF-8", // Specify character encoding used by source files + "-feature", // Emit warning and location for usages of features + // that should be imported explicitly + "-language:existentials", // Enable existential types + "-language:implicitConversions", // Enable implicit conversions + "-Yclosure-elim", // Perform closure elimination + "-Yinline", // Perform inlining when possible + "-Ywarn-unused-import" // Warn on unused imports + ), publishMavenStyle := true, pgpPassphrase := Option(System.getenv().get("PASSPHRASE")).map(_.toArray), @@ -74,30 +84,32 @@ object BuildGearpump extends sbt.Build { } }, - publishArtifact in Test := true, - pomExtra := { + // scalastyle:off line.size.limit <url>https://github.com/apache/incubator-gearpump</url> - <licenses> - <license> - <name>Apache 2</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - </license> - </licenses> - <scm> - <connection>scm:git://git.apache.org/incubator-gearpump.git</connection> - <developerConnection>scm:git:[email protected]:apache/incubator-gearpump</developerConnection> - <url>github.com/apache/incubator-gearpump</url> - </scm> - <developers> - <developer> - <id>gearpump</id> - <name>Gearpump Team</name> - <url>http://gearpump.incubator.apache.org/community.html#who-we-are</url> - </developer> - </developers> + <licenses> + <license> + <name>Apache 2</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + </license> + </licenses> + <scm> + <connection>scm:git://git.apache.org/incubator-gearpump.git</connection> + <developerConnection>scm:git:[email protected]:apache/incubator-gearpump</developerConnection> + <url>github.com/apache/incubator-gearpump</url> + </scm> + <developers> + <developer> + <id>gearpump</id> + <name>Gearpump Team</name> + <url>http://gearpump.incubator.apache.org/community.html#who-we-are</url> + </developer> + </developers> + // scalastyle:on line.size.limit }, + publishArtifact in Test := true, + pomPostProcess := { (node: xml.Node) => changeShadedDeps( Set( @@ -194,7 +206,7 @@ object BuildGearpump extends sbt.Build { libraryDependencies ++= Seq( "com.goldmansachs" % "gs-collections" % gsCollectionsVersion - ), + ) ++ annotationDependencies, pomPostProcess := { (node: xml.Node) => changeShadedDeps( http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/project/Dependencies.scala ---------------------------------------------------------------------- diff --git a/project/Dependencies.scala b/project/Dependencies.scala index aa4e52f..90b57d3 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -55,6 +55,14 @@ object Dependencies { val jedisVersion = "2.9.0" val rabbitmqVersion = "3.5.3" + val annotationDependencies = Seq( + // work around for compiler warnings like + // "Class javax.annotation.CheckReturnValue not found - continuing with a stub" + // see https://issues.scala-lang.org/browse/SI-8978 + // marked as "provided" to be excluded from assembling + "com.google.code.findbugs" % "jsr305" % "3.0.2" % "provided" + ) + val coreDependencies = Seq( libraryDependencies ++= Seq( "org.slf4j" % "slf4j-api" % slf4jVersion, @@ -93,11 +101,12 @@ object Dependencies { exclude("org.slf4j", "slf4j-api"), "com.codahale.metrics" % "metrics-jvm" % codahaleVersion exclude("org.slf4j", "slf4j-api"), + "com.typesafe.akka" %% "akka-testkit" % akkaVersion % "test", "org.scalatest" %% "scalatest" % scalaTestVersion % "test", "org.scalacheck" %% "scalacheck" % scalaCheckVersion % "test", "org.mockito" % "mockito-core" % mockitoVersion % "test", "junit" % "junit" % junitVersion % "test" - ) + ) ++ annotationDependencies ) } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/services/jvm/src/main/scala/org/apache/gearpump/services/MasterService.scala ---------------------------------------------------------------------- diff --git a/services/jvm/src/main/scala/org/apache/gearpump/services/MasterService.scala b/services/jvm/src/main/scala/org/apache/gearpump/services/MasterService.scala index be96577..1f6141a 100644 --- a/services/jvm/src/main/scala/org/apache/gearpump/services/MasterService.scala +++ b/services/jvm/src/main/scala/org/apache/gearpump/services/MasterService.scala @@ -40,7 +40,7 @@ import org.apache.gearpump.cluster.MasterToClient.{HistoryMetrics, MasterConfig, import org.apache.gearpump.cluster.client.ClientContext import org.apache.gearpump.cluster.worker.WorkerSummary import org.apache.gearpump.cluster.{ClusterConfig, UserConfig} -import org.apache.gearpump.jarstore.{JarStoreClient, FileDirective, JarStoreServer} +import org.apache.gearpump.jarstore.{JarStoreClient, FileDirective} import org.apache.gearpump.streaming.partitioner.{PartitionerByClassName, PartitionerDescription} import org.apache.gearpump.services.MasterService.{BuiltinPartitioners, SubmitApplicationRequest} // NOTE: This cannot be removed!!! http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/services/jvm/src/main/scala/org/apache/gearpump/services/StaticService.scala ---------------------------------------------------------------------- diff --git a/services/jvm/src/main/scala/org/apache/gearpump/services/StaticService.scala b/services/jvm/src/main/scala/org/apache/gearpump/services/StaticService.scala index 7b33987..762b9e4 100644 --- a/services/jvm/src/main/scala/org/apache/gearpump/services/StaticService.scala +++ b/services/jvm/src/main/scala/org/apache/gearpump/services/StaticService.scala @@ -23,7 +23,6 @@ import akka.http.scaladsl.marshalling.ToResponseMarshallable import akka.http.scaladsl.model._ import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.marshalling.ToResponseMarshallable._ -import akka.http.scaladsl.server.{RejectionHandler, StandardRoute} import akka.stream.Materializer import org.apache.gearpump.util.Util // NOTE: This cannot be removed!!! http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/services/jvm/src/test/scala/org/apache/gearpump/services/AppMasterServiceSpec.scala ---------------------------------------------------------------------- diff --git a/services/jvm/src/test/scala/org/apache/gearpump/services/AppMasterServiceSpec.scala b/services/jvm/src/test/scala/org/apache/gearpump/services/AppMasterServiceSpec.scala index 80264d2..4f2b642 100644 --- a/services/jvm/src/test/scala/org/apache/gearpump/services/AppMasterServiceSpec.scala +++ b/services/jvm/src/test/scala/org/apache/gearpump/services/AppMasterServiceSpec.scala @@ -27,16 +27,14 @@ import akka.testkit.TestActor.{AutoPilot, KeepRunning} import akka.testkit.{TestKit, TestProbe} import com.typesafe.config.{Config, ConfigFactory} import org.scalatest.{BeforeAndAfterAll, FlatSpec, Matchers} -import org.slf4j.Logger import upickle.default.read import org.apache.gearpump.cluster.AppMasterToMaster.GeneralAppMasterSummary import org.apache.gearpump.cluster.ClientToMaster.{GetLastFailure, QueryAppMasterConfig, QueryHistoryMetrics, ResolveAppId} import org.apache.gearpump.cluster.MasterToAppMaster.{AppMasterData, AppMasterDataDetailRequest, AppMasterDataRequest} import org.apache.gearpump.cluster.MasterToClient._ import org.apache.gearpump.cluster.{ApplicationStatus, TestUtil} -import org.apache.gearpump.jarstore.{JarStoreClient, JarStoreServer} +import org.apache.gearpump.jarstore.JarStoreClient import org.apache.gearpump.streaming.executor.Executor.{ExecutorConfig, ExecutorSummary, GetExecutorSummary, QueryExecutorConfig} -import org.apache.gearpump.util.LogUtil // NOTE: This cannot be removed!!! import org.apache.gearpump.services.util.UpickleUtil._ http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/services/jvm/src/test/scala/org/apache/gearpump/services/MasterServiceSpec.scala ---------------------------------------------------------------------- diff --git a/services/jvm/src/test/scala/org/apache/gearpump/services/MasterServiceSpec.scala b/services/jvm/src/test/scala/org/apache/gearpump/services/MasterServiceSpec.scala index 39c0de0..07e44c1 100644 --- a/services/jvm/src/test/scala/org/apache/gearpump/services/MasterServiceSpec.scala +++ b/services/jvm/src/test/scala/org/apache/gearpump/services/MasterServiceSpec.scala @@ -40,7 +40,7 @@ import org.apache.gearpump.cluster.MasterToAppMaster.{AppMasterData, AppMastersD import org.apache.gearpump.cluster.MasterToClient._ import org.apache.gearpump.cluster.TestUtil import org.apache.gearpump.cluster.worker.{WorkerId, WorkerSummary} -import org.apache.gearpump.jarstore.{JarStoreClient, JarStoreServer} +import org.apache.gearpump.jarstore.JarStoreClient import org.apache.gearpump.services.MasterService.{BuiltinPartitioners, SubmitApplicationRequest} // NOTE: This cannot be removed!!! import org.apache.gearpump.services.util.UpickleUtil._ @@ -166,7 +166,7 @@ class MasterServiceSpec extends FlatSpec with ScalatestRouteTest private def entity(file: File)(implicit ec: ExecutionContext): Future[RequestEntity] = { val entity = HttpEntity(MediaTypes.`application/octet-stream`, file.length(), - FileIO.fromFile(file, chunkSize = 100000)) + FileIO.fromPath(file.toPath, chunkSize = 100000)) val body = Source.single( Multipart.FormData.BodyPart( http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/streaming/src/main/scala/org/apache/gearpump/streaming/ClusterMessage.scala ---------------------------------------------------------------------- diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/ClusterMessage.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/ClusterMessage.scala index 8a76916..d85d042 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/ClusterMessage.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/ClusterMessage.scala @@ -18,8 +18,6 @@ package org.apache.gearpump.streaming -import scala.language.existentials - import akka.actor.ActorRef import org.apache.gearpump.TimeStamp http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/streaming/src/main/scala/org/apache/gearpump/streaming/StreamApplication.scala ---------------------------------------------------------------------- diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/StreamApplication.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/StreamApplication.scala index 435414b..125612b 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/StreamApplication.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/StreamApplication.scala @@ -18,7 +18,6 @@ package org.apache.gearpump.streaming -import scala.language.implicitConversions import scala.reflect.ClassTag import akka.actor.ActorSystem import org.apache.gearpump.{MAX_TIME_MILLIS, MIN_TIME_MILLIS, TimeStamp} http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/streaming/src/main/scala/org/apache/gearpump/streaming/appmaster/ClockService.scala ---------------------------------------------------------------------- diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/appmaster/ClockService.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/appmaster/ClockService.scala index 77a966a..b514d6f 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/appmaster/ClockService.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/appmaster/ClockService.scala @@ -38,7 +38,6 @@ import org.apache.gearpump.util.LogUtil import org.slf4j.Logger import scala.concurrent.duration.FiniteDuration -import scala.language.implicitConversions /** * Maintains a global view of message timestamp in the application http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/streaming/src/main/scala/org/apache/gearpump/streaming/dsl/window/impl/Window.scala ---------------------------------------------------------------------- diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/dsl/window/impl/Window.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/dsl/window/impl/Window.scala index 870c334..2425ff2 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/dsl/window/impl/Window.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/dsl/window/impl/Window.scala @@ -19,13 +19,7 @@ package org.apache.gearpump.streaming.dsl.window.impl import java.time.Instant -import akka.actor.ActorSystem -import org.apache.gearpump.cluster.UserConfig -import org.apache.gearpump.streaming.Constants._ -import org.apache.gearpump.streaming.Processor -import org.apache.gearpump.{Message, TimeStamp} -import org.apache.gearpump.streaming.dsl.window.api._ -import org.apache.gearpump.streaming.task.Task +import org.apache.gearpump.TimeStamp object Window { def ofEpochMilli(startTime: TimeStamp, endTime: TimeStamp): Window = { http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/streaming/src/main/scala/org/apache/gearpump/streaming/state/api/PersistentTask.scala ---------------------------------------------------------------------- diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/state/api/PersistentTask.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/state/api/PersistentTask.scala index d3ffaa9..df37ba1 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/state/api/PersistentTask.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/state/api/PersistentTask.scala @@ -41,8 +41,6 @@ abstract class PersistentTask[T](taskContext: TaskContext, conf: UserConfig) extends Task(taskContext, conf) { import taskContext._ - import org.apache.gearpump.streaming.state.api.PersistentTask._ - val checkpointStoreFactory = conf.getValue[CheckpointStoreFactory]( PersistentStateConfig.STATE_CHECKPOINT_STORE_FACTORY).get val checkpointStore = checkpointStoreFactory.getCheckpointStore( http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/streaming/src/main/scala/org/apache/gearpump/streaming/state/impl/InMemoryCheckpointStore.scala ---------------------------------------------------------------------- diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/state/impl/InMemoryCheckpointStore.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/state/impl/InMemoryCheckpointStore.scala index 2591856..8853d07 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/state/impl/InMemoryCheckpointStore.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/state/impl/InMemoryCheckpointStore.scala @@ -19,8 +19,6 @@ package org.apache.gearpump.streaming.state.impl import org.apache.gearpump.TimeStamp -import org.apache.gearpump.cluster.UserConfig -import org.apache.gearpump.streaming.task.TaskContext import org.apache.gearpump.streaming.transaction.api.{CheckpointStore, CheckpointStoreFactory} /** http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/streaming/src/main/scala/org/apache/gearpump/streaming/transaction/api/CheckpointStore.scala ---------------------------------------------------------------------- diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/transaction/api/CheckpointStore.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/transaction/api/CheckpointStore.scala index 4650ac2..1ef255e 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/transaction/api/CheckpointStore.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/transaction/api/CheckpointStore.scala @@ -19,8 +19,6 @@ package org.apache.gearpump.streaming.transaction.api import org.apache.gearpump.TimeStamp -import org.apache.gearpump.cluster.UserConfig -import org.apache.gearpump.streaming.task.TaskContext /** * CheckpointStore persistently stores mapping of timestamp to checkpoint http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/streaming/src/test/scala/org/apache/gearpump/streaming/StreamingTestUtil.scala ---------------------------------------------------------------------- diff --git a/streaming/src/test/scala/org/apache/gearpump/streaming/StreamingTestUtil.scala b/streaming/src/test/scala/org/apache/gearpump/streaming/StreamingTestUtil.scala index c8478f6..d75a1a0 100644 --- a/streaming/src/test/scala/org/apache/gearpump/streaming/StreamingTestUtil.scala +++ b/streaming/src/test/scala/org/apache/gearpump/streaming/StreamingTestUtil.scala @@ -20,7 +20,6 @@ package org.apache.gearpump.streaming import akka.actor._ import akka.testkit.TestActorRef import org.apache.gearpump.cluster.AppMasterToMaster.RegisterAppMaster -import org.apache.gearpump.cluster.appmaster.ApplicationRuntimeInfo import org.apache.gearpump.cluster.scheduler.Resource import org.apache.gearpump.cluster.{AppDescription, AppMasterContext, MiniCluster, UserConfig} import org.apache.gearpump.streaming.appmaster.AppMaster http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/streaming/src/test/scala/org/apache/gearpump/streaming/appmaster/AppMasterSpec.scala ---------------------------------------------------------------------- diff --git a/streaming/src/test/scala/org/apache/gearpump/streaming/appmaster/AppMasterSpec.scala b/streaming/src/test/scala/org/apache/gearpump/streaming/appmaster/AppMasterSpec.scala index 4faa058..8819c0c 100644 --- a/streaming/src/test/scala/org/apache/gearpump/streaming/appmaster/AppMasterSpec.scala +++ b/streaming/src/test/scala/org/apache/gearpump/streaming/appmaster/AppMasterSpec.scala @@ -17,10 +17,8 @@ */ package org.apache.gearpump.streaming.appmaster - import akka.actor.{ActorRef, ActorSystem, Props} import akka.testkit.{TestActorRef, TestProbe} -import com.typesafe.config.ConfigFactory import org.apache.gearpump.cluster.AppMasterToMaster._ import org.apache.gearpump.cluster.AppMasterToWorker.LaunchExecutor import org.apache.gearpump.cluster.ClientToMaster.GetLastFailure @@ -40,7 +38,7 @@ import org.apache.gearpump.streaming.appmaster.AppMaster.{LookupTaskActorRef, Ta import org.apache.gearpump.streaming.task.{TaskContext, _} import org.apache.gearpump.streaming.{DAG, Processor, StreamApplication} import org.apache.gearpump.util.ActorSystemBooter.RegisterActorSystem -import org.apache.gearpump.util.{ActorUtil, Constants, Graph} +import org.apache.gearpump.util.{ActorUtil, Graph} import org.apache.gearpump.util.Graph._ import org.scalatest._ http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/streaming/src/test/scala/org/apache/gearpump/streaming/appmaster/DagManagerSpec.scala ---------------------------------------------------------------------- diff --git a/streaming/src/test/scala/org/apache/gearpump/streaming/appmaster/DagManagerSpec.scala b/streaming/src/test/scala/org/apache/gearpump/streaming/appmaster/DagManagerSpec.scala index adde927..7020210 100644 --- a/streaming/src/test/scala/org/apache/gearpump/streaming/appmaster/DagManagerSpec.scala +++ b/streaming/src/test/scala/org/apache/gearpump/streaming/appmaster/DagManagerSpec.scala @@ -18,7 +18,6 @@ package org.apache.gearpump.streaming.appmaster - import akka.actor.{ActorSystem, Props} import akka.testkit.TestProbe import org.apache.gearpump.cluster.{TestUtil, UserConfig} @@ -28,7 +27,6 @@ import org.apache.gearpump.streaming.task.{Subscriber, TaskActor} import org.apache.gearpump.streaming._ import org.apache.gearpump.util.Graph import org.apache.gearpump.util.Graph._ -import org.scalatest.mock.MockitoSugar import org.scalatest.{BeforeAndAfterAll, Matchers, WordSpecLike} import scala.concurrent.Await http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/streaming/src/test/scala/org/apache/gearpump/streaming/dsl/task/GroupByTaskSpec.scala ---------------------------------------------------------------------- diff --git a/streaming/src/test/scala/org/apache/gearpump/streaming/dsl/task/GroupByTaskSpec.scala b/streaming/src/test/scala/org/apache/gearpump/streaming/dsl/task/GroupByTaskSpec.scala index 0f87a1c..9e6bf59 100644 --- a/streaming/src/test/scala/org/apache/gearpump/streaming/dsl/task/GroupByTaskSpec.scala +++ b/streaming/src/test/scala/org/apache/gearpump/streaming/dsl/task/GroupByTaskSpec.scala @@ -24,7 +24,7 @@ import org.apache.gearpump.cluster.UserConfig import org.apache.gearpump.streaming.dsl.plan.functions.DummyRunner import org.apache.gearpump.streaming.dsl.window.api.GlobalWindows import org.apache.gearpump.streaming.{Constants, MockUtil} -import org.apache.gearpump.streaming.dsl.window.impl.{DefaultWindowRunner, WindowRunner} +import org.apache.gearpump.streaming.dsl.window.impl.DefaultWindowRunner import org.apache.gearpump.streaming.source.Watermark import org.mockito.Mockito._ import org.scalacheck.Gen http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/b6f5ccd6/streaming/src/test/scala/org/apache/gearpump/streaming/dsl/task/TransformTaskSpec.scala ---------------------------------------------------------------------- diff --git a/streaming/src/test/scala/org/apache/gearpump/streaming/dsl/task/TransformTaskSpec.scala b/streaming/src/test/scala/org/apache/gearpump/streaming/dsl/task/TransformTaskSpec.scala index 0bb4d6a..e38c5a3 100644 --- a/streaming/src/test/scala/org/apache/gearpump/streaming/dsl/task/TransformTaskSpec.scala +++ b/streaming/src/test/scala/org/apache/gearpump/streaming/dsl/task/TransformTaskSpec.scala @@ -23,7 +23,6 @@ import org.apache.gearpump.Message import org.apache.gearpump.cluster.UserConfig import org.apache.gearpump.streaming.MockUtil import org.apache.gearpump.streaming.dsl.window.impl.{TimestampedValue, TriggeredOutputs, WindowRunner} -import org.mockito.{Matchers => MockitoMatchers} import org.mockito.Mockito.{verify, when} import org.scalacheck.Gen import org.scalatest.{Matchers, PropSpec}
