diff options
author | Jakob Odersky <jakob@odersky.com> | 2017-04-17 15:40:20 -0700 |
---|---|---|
committer | Jakob Odersky <jakob@odersky.com> | 2017-04-17 15:40:20 -0700 |
commit | 63d00dacc13122618c3bdb29badc8449c52e0bb7 (patch) | |
tree | 87c9de6153a17f02e01b52888eb4cd5fb3878db2 /core | |
parent | bfe0eaf09c23116af4bf610ecb4fceb9e26b640b (diff) | |
download | akka-serial-63d00dacc13122618c3bdb29badc8449c52e0bb7.tar.gz akka-serial-63d00dacc13122618c3bdb29badc8449c52e0bb7.tar.bz2 akka-serial-63d00dacc13122618c3bdb29badc8449c52e0bb7.zip |
Fix deprecation warnings
Diffstat (limited to 'core')
-rw-r--r-- | core/src/main/scala/akka/serial/Serial.scala | 10 | ||||
-rw-r--r-- | core/src/main/scala/akka/serial/Watcher.scala | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/core/src/main/scala/akka/serial/Serial.scala b/core/src/main/scala/akka/serial/Serial.scala index a8e564a..c70d66e 100644 --- a/core/src/main/scala/akka/serial/Serial.scala +++ b/core/src/main/scala/akka/serial/Serial.scala @@ -1,10 +1,16 @@ package akka.serial -import akka.actor.ExtensionKey +import akka.actor.{ActorSystem, ExtendedActorSystem, ExtensionId, ExtensionIdProvider} import akka.util.ByteString /** Defines messages used by akka-serial's serial IO layer. */ -object Serial extends ExtensionKey[SerialExt] { +object Serial extends ExtensionId[SerialExt] with ExtensionIdProvider { + + override def lookup = Serial + + override def createExtension(system: ExtendedActorSystem): SerialExt = new SerialExt(system) + + override def get(system: ActorSystem): SerialExt = super.get(system) /** Base trait for any akka-serial-related messages. */ sealed trait Message diff --git a/core/src/main/scala/akka/serial/Watcher.scala b/core/src/main/scala/akka/serial/Watcher.scala index faaf39a..0dfaa5f 100644 --- a/core/src/main/scala/akka/serial/Watcher.scala +++ b/core/src/main/scala/akka/serial/Watcher.scala @@ -3,7 +3,7 @@ package akka.serial import akka.actor.{ Actor, ActorRef, Props, Terminated } import java.nio.file.{ ClosedWatchServiceException, FileSystems, Files, Path, Paths, WatchEvent, WatchKey } import java.nio.file.StandardWatchEventKinds._ -import scala.collection.JavaConversions._ +import scala.collection.JavaConverters._ import scala.collection.mutable.{ HashMap, Map, MultiMap, Set } import scala.util.{ Failure, Success, Try } @@ -23,7 +23,7 @@ private[serial] class Watcher(from: Option[ActorRef]) extends Actor { while (!stop) { try { val key = service.take() - key.pollEvents() foreach { ev => + key.pollEvents().asScala foreach { ev => val event = ev.asInstanceOf[WatchEvent[Path]] if (event.kind == ENTRY_CREATE) { val directory = key.watchable().asInstanceOf[Path] @@ -95,7 +95,7 @@ private[serial] class Watcher(from: Option[ActorRef]) extends Actor { case Success(key) => context watch sender if (!skipInitial) { - Files.newDirectoryStream(normalPath) foreach { path => + Files.newDirectoryStream(normalPath).asScala foreach { path => if (!Files.isDirectory(path)) { reply(Serial.Connected(path.toString), sender) } |