FTP: enable Scala 2.13 and 2.12.9 compilation (#1779)

FTP: enable Scala 2.13 and 2.12.9 compilation
akka · Aug 26, 2019 · c473198 · c473198
2 parents 99fd53d + 5cc70a2
commit c473198
Show file tree

Hide file tree

Showing 12 changed files with 545 additions and 165 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,8 +24,8 @@ jobs:
     - env: CMD="++2.11.12 Test/compile"
       name: "Compile all code with Scala 2.11"
       if: type != cron
-    - env: CMD="++2.12.7 Test/compile"
-      name: "Compile all code with Scala 2.12 and fatal warnings enabled. Run locally with: env CI=true sbt ++2.12.7 Test/compile"
+    - env: CMD="++2.12.9 Test/compile"
+      name: "Compile all code with Scala 2.12 and fatal warnings enabled. Run locally with: env CI=true sbt ++2.12.9 Test/compile"
     - env: CMD="++2.13.0 Test/compile"
       name: "Compile all code with Scala 2.13"
     - env: CMD="unidoc"
@@ -144,8 +144,8 @@ jobs:
     - stage: publish
       env: CMD="++2.11.12 publish"
       name: "Publish artifacts for Scala 2.11.12"
-    - env: CMD="++2.12.7 publish"
-      name: "Publish artifacts for Scala 2.12.7"
+    - env: CMD="++2.12.9 publish"
+      name: "Publish artifacts for Scala 2.12.9"
     - env: CMD="++2.13.0 publish"
       name: "Publish artifacts for Scala 2.13.0"
     - script: openssl aes-256-cbc -K $encrypted_bbf1dc4f2a07_key -iv $encrypted_bbf1dc4f2a07_iv -in .travis/travis_alpakka_rsa.enc -out .travis/id_rsa -d && eval "$(ssh-agent -s)" && chmod 600 .travis/id_rsa && ssh-add .travis/id_rsa && sbt -jvm-opts .jvmopts-travis docs/publishRsync

diff --git a/build.sbt b/build.sbt
@@ -127,8 +127,7 @@ lazy val ftp = alpakkaProject(
   parallelExecution in Test := false,
   fork in Test := true,
   // To avoid potential blocking in machines with low entropy (default is `/dev/random`)
-  javaOptions in Test += "-Djava.security.egd=file:/dev/./urandom",
-  crossScalaVersions -= Dependencies.Scala213 // https://github.com/akka/alpakka/issues/1532
+  javaOptions in Test += "-Djava.security.egd=file:/dev/./urandom"
 )
 
 lazy val geode =

diff --git a/ftp/src/main/mima-filters/1.1.x.backwards.excludes b/ftp/src/main/mima-filters/1.1.x.backwards.excludes
@@ -1,2 +1,5 @@
-# Allow changes to impl
-ProblemFilters.exclude[Problem]("akka.stream.alpakka.ftp.impl.*")
+# Restructure to enable compilation with Scala 2.12.8+ PR #1779
+ProblemFilters.exclude[DirectAbstractMethodProblem]("akka.stream.alpakka.ftp.javadsl.FtpApi.*")
+ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.alpakka.ftp.javadsl.FtpApi.ftpLike")
+ProblemFilters.exclude[DirectAbstractMethodProblem]("akka.stream.alpakka.ftp.scaladsl.FtpApi.*")
+ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.alpakka.ftp.scaladsl.FtpApi.ftpLike")
diff --git a/ftp/src/main/scala/akka/stream/alpakka/ftp/impl/CommonFtpOperations.scala b/ftp/src/main/scala/akka/stream/alpakka/ftp/impl/CommonFtpOperations.scala
@@ -48,17 +48,17 @@ private[ftp] trait CommonFtpOperations {
 
   private def getPosixFilePermissions(file: FTPFile) =
     Map(
-      PosixFilePermission.OWNER_READ → file.hasPermission(FTPFile.USER_ACCESS, FTPFile.READ_PERMISSION),
-      PosixFilePermission.OWNER_WRITE → file.hasPermission(FTPFile.USER_ACCESS, FTPFile.WRITE_PERMISSION),
-      PosixFilePermission.OWNER_EXECUTE → file.hasPermission(FTPFile.USER_ACCESS, FTPFile.EXECUTE_PERMISSION),
-      PosixFilePermission.GROUP_READ → file.hasPermission(FTPFile.GROUP_ACCESS, FTPFile.READ_PERMISSION),
-      PosixFilePermission.GROUP_WRITE → file.hasPermission(FTPFile.GROUP_ACCESS, FTPFile.WRITE_PERMISSION),
-      PosixFilePermission.GROUP_EXECUTE → file.hasPermission(FTPFile.GROUP_ACCESS, FTPFile.EXECUTE_PERMISSION),
-      PosixFilePermission.OTHERS_READ → file.hasPermission(FTPFile.WORLD_ACCESS, FTPFile.READ_PERMISSION),
-      PosixFilePermission.OTHERS_WRITE → file.hasPermission(FTPFile.WORLD_ACCESS, FTPFile.WRITE_PERMISSION),
-      PosixFilePermission.OTHERS_EXECUTE → file.hasPermission(FTPFile.WORLD_ACCESS, FTPFile.EXECUTE_PERMISSION)
+      PosixFilePermission.OWNER_READ -> file.hasPermission(FTPFile.USER_ACCESS, FTPFile.READ_PERMISSION),
+      PosixFilePermission.OWNER_WRITE -> file.hasPermission(FTPFile.USER_ACCESS, FTPFile.WRITE_PERMISSION),
+      PosixFilePermission.OWNER_EXECUTE -> file.hasPermission(FTPFile.USER_ACCESS, FTPFile.EXECUTE_PERMISSION),
+      PosixFilePermission.GROUP_READ -> file.hasPermission(FTPFile.GROUP_ACCESS, FTPFile.READ_PERMISSION),
+      PosixFilePermission.GROUP_WRITE -> file.hasPermission(FTPFile.GROUP_ACCESS, FTPFile.WRITE_PERMISSION),
+      PosixFilePermission.GROUP_EXECUTE -> file.hasPermission(FTPFile.GROUP_ACCESS, FTPFile.EXECUTE_PERMISSION),
+      PosixFilePermission.OTHERS_READ -> file.hasPermission(FTPFile.WORLD_ACCESS, FTPFile.READ_PERMISSION),
+      PosixFilePermission.OTHERS_WRITE -> file.hasPermission(FTPFile.WORLD_ACCESS, FTPFile.WRITE_PERMISSION),
+      PosixFilePermission.OTHERS_EXECUTE -> file.hasPermission(FTPFile.WORLD_ACCESS, FTPFile.EXECUTE_PERMISSION)
     ).collect {
-      case (perm, true) ⇒ perm
+      case (perm, true) => perm
     }.toSet
 
   def listFiles(handler: Handler): immutable.Seq[FtpFile] = listFiles("", handler)

diff --git a/ftp/src/main/scala/akka/stream/alpakka/ftp/impl/FtpIOGraphStage.scala b/ftp/src/main/scala/akka/stream/alpakka/ftp/impl/FtpIOGraphStage.scala
@@ -178,7 +178,7 @@ private[ftp] trait FtpIOSinkStage[FtpClient, S <: RemoteFileSettings]
               write(grab(in))
               pull(in)
             } catch {
-              case NonFatal(e) ⇒
+              case NonFatal(e) =>
                 failed = true
                 matFailure(e)
                 failStage(e)

diff --git a/ftp/src/main/scala/akka/stream/alpakka/ftp/impl/FtpSourceFactory.scala b/ftp/src/main/scala/akka/stream/alpakka/ftp/impl/FtpSourceFactory.scala
@@ -16,9 +16,7 @@ import org.apache.commons.net.ftp.{FTPClient, FTPSClient}
  * INTERNAL API
  */
 @InternalApi
-private[ftp] trait FtpSourceFactory[FtpClient] { self =>
-
-  type S <: RemoteFileSettings
+private[ftp] trait FtpSourceFactory[FtpClient, S <: RemoteFileSettings] { self =>
 
   protected[this] final val DefaultChunkSize = 8192
 
@@ -140,7 +138,7 @@ private[ftp] trait FtpSourceFactory[FtpClient] { self =>
  * INTERNAL API
  */
 @InternalApi
-private[ftp] trait FtpSource extends FtpSourceFactory[FTPClient] {
+private[ftp] trait FtpSource extends FtpSourceFactory[FTPClient, FtpSettings] {
   protected final val FtpBrowserSourceName = "FtpBrowserSource"
   protected final val FtpIOSourceName = "FtpIOSource"
   protected final val FtpDirectorySource = "FtpDirectorySource"
@@ -157,7 +155,7 @@ private[ftp] trait FtpSource extends FtpSourceFactory[FTPClient] {
  * INTERNAL API
  */
 @InternalApi
-private[ftp] trait FtpsSource extends FtpSourceFactory[FTPSClient] {
+private[ftp] trait FtpsSource extends FtpSourceFactory[FTPSClient, FtpsSettings] {
   protected final val FtpsBrowserSourceName = "FtpsBrowserSource"
   protected final val FtpsIOSourceName = "FtpsIOSource"
   protected final val FtpsDirectorySource = "FtpsDirectorySource"
@@ -174,7 +172,7 @@ private[ftp] trait FtpsSource extends FtpSourceFactory[FTPSClient] {
  * INTERNAL API
  */
 @InternalApi
-private[ftp] trait SftpSource extends FtpSourceFactory[SSHClient] {
+private[ftp] trait SftpSource extends FtpSourceFactory[SSHClient, SftpSettings] {
   protected final val sFtpBrowserSourceName = "sFtpBrowserSource"
   protected final val sFtpIOSourceName = "sFtpIOSource"
   protected final val sFtpDirectorySource = "sFtpDirectorySource"
@@ -195,8 +193,8 @@ private[ftp] trait SftpSource extends FtpSourceFactory[SSHClient] {
 private[ftp] trait FtpDefaultSettings {
   protected def defaultSettings(
       hostname: String,
-      username: Option[String],
-      password: Option[String]
+      username: Option[String] = None,
+      password: Option[String] = None
   ): FtpSettings =
     FtpSettings(
       InetAddress.getByName(hostname)
@@ -215,8 +213,8 @@ private[ftp] trait FtpDefaultSettings {
 private[ftp] trait FtpsDefaultSettings {
   protected def defaultSettings(
       hostname: String,
-      username: Option[String],
-      password: Option[String]
+      username: Option[String] = None,
+      password: Option[String] = None
   ): FtpsSettings =
     FtpsSettings(
       InetAddress.getByName(hostname)
@@ -235,8 +233,8 @@ private[ftp] trait FtpsDefaultSettings {
 private[ftp] trait SftpDefaultSettings {
   protected def defaultSettings(
       hostname: String,
-      username: Option[String],
-      password: Option[String]
+      username: Option[String] = None,
+      password: Option[String] = None
   ): SftpSettings =
     SftpSettings(
       InetAddress.getByName(hostname)