Remove unnecessary FileDescriptor overrides

Author: bdmendes

modules/io/src/main/scala/com/kevel/apso/io/FileDescriptor.scala

@@ -86,7 +86,7 @@ trait FileDescriptor {
     * @return
     *   an iterator with the lines of this file.
     */
-  def lines(): Iterator[String] = Source.fromInputStream(stream()).getLines()
+  final def lines(): Iterator[String] = Source.fromInputStream(stream()).getLines()
 
   /** Returns true if the fd points to a directory
     * @return
@@ -130,15 +130,15 @@ trait FileDescriptor {
     * @return
     *   the new file descriptor with the updated path
     */
-  def /(name: String): Self = child(name)
+  final def /(name: String): Self = child(name)
 
   /** Adds multiple new child nodes to the filesystem path.
     * @param names
     *   the node names to add.
     * @return
     *   the new file descriptor with the updated path
     */
-  def children(names: String*): Self =
+  final def children(names: String*): Self =
     names.foldLeft(this.asInstanceOf[Self])((acc, c) => acc.child(c).asInstanceOf[Self])
 
   /** Changes the path of the file descriptor using unix's cd syntax related to the current directory.
@@ -154,7 +154,7 @@ trait FileDescriptor {
     * @return
     *   the new file descriptor with the updated path
     */
-  def cd(pathString: String): Self = {
+  final def cd(pathString: String): Self = {
     pathString.split("/").toList.foldLeft(this.asInstanceOf[Self]) {
       case (acc, "." | "") => acc
       case (acc, "..")     => acc.parent().asInstanceOf[Self]
@@ -168,15 +168,15 @@ trait FileDescriptor {
     * @return
     *   a new file descriptor pointing to a sibling of the current file descriptor
     */
-  def sibling(name: String): Self = sibling(_ => name)
+  final def sibling(name: String): Self = sibling(_ => name)
 
   /** Returns a new file descriptor pointing to a sibling of the current file descriptor
     * @param f
     *   a function that returns a new name from the current name of the file descriptor
     * @return
     *   a new file descriptor pointing to a sibling of the current file descriptor
     */
-  def sibling(f: String => String): Self = parent().child(f(name)).asInstanceOf[Self]
+  final def sibling(f: String => String): Self = parent().child(f(name)).asInstanceOf[Self]
 
   /** Returns true if the file pointed by the file descriptor exists
     * @return

modules/io/src/main/scala/com/kevel/apso/io/GCSFileDescriptor.scala

@@ -61,15 +61,6 @@ case class GCSFileDescriptor(
 
   def stream(offset: Long = 0L): InputStream = bucket.stream(builtPath, offset)
 
-  override def cd(pathString: String): GCSFileDescriptor = {
-    val newPath = pathString.split("/").map(_.trim).toList.foldLeft(elements) {
-      case (acc, "." | "") => acc
-      case (acc, "..")     => acc.dropRight(1)
-      case (acc, segment)  => acc :+ segment
-    }
-    this.copy(elements = newPath)
-  }
-
   override def list: Iterator[GCSFileDescriptor] = {
     val prefix = elements.mkString("/")
     bucket
@@ -85,9 +76,6 @@ case class GCSFileDescriptor(
     }
   }
 
-  override def sibling(f: String => String): GCSFileDescriptor =
-    GCSFileDescriptor(bucket, elements.dropRight(1) :+ f(name))
-
   private lazy val isDirectoryRemote: Boolean =
     elements.isEmpty || bucket.isDirectory(builtPath)
 

modules/io/src/main/scala/com/kevel/apso/io/LocalFileDescriptor.scala

@@ -45,29 +45,11 @@ case class LocalFileDescriptor(initialPath: String) extends FileDescriptor with
     LocalFileDescriptor(parentPath.toString)
   }
 
-  override def /(name: String): LocalFileDescriptor = child(name)
-
   def child(name: String): LocalFileDescriptor = {
     val childPath = normalizedPath.resolve(name)
     LocalFileDescriptor(childPath.toString)
   }
 
-  override def children(names: String*): LocalFileDescriptor = {
-    val childPath = names.foldLeft(normalizedPath) { (acc, child) =>
-      acc.resolve(child)
-    }
-    LocalFileDescriptor(childPath.toString)
-  }
-
-  override def cd(pathString: String): LocalFileDescriptor = {
-    val newPath = pathString.split("/").map(_.trim).toList.foldLeft(normalizedPath) {
-      case (acc, "." | "") => acc
-      case (acc, "..")     => acc.getParent
-      case (acc, segment)  => acc.resolve(segment)
-    }
-    LocalFileDescriptor(newPath.toString)
-  }
-
   def download(localTarget: LocalFileDescriptor, safeDownloading: Boolean): Boolean = {
     if (isDirectory || localTarget.isDirectory) {
       throw new Exception("File descriptor points to a directory")
@@ -157,10 +139,6 @@ case class LocalFileDescriptor(initialPath: String) extends FileDescriptor with
 
   def exists: Boolean = file.exists()
 
-  override def sibling(f: String => String): LocalFileDescriptor = {
-    LocalFileDescriptor(normalizedPath.resolveSibling(f(name)).toString)
-  }
-
   def delete(): Boolean = file.delete()
 
   /** Deletes the directory associated with the file descriptor by recursively deleting all the directories and files

modules/io/src/main/scala/com/kevel/apso/io/RemoteFileDescriptor.scala

@@ -25,12 +25,9 @@ trait RemoteFileDescriptor { this: FileDescriptor =>
 
   protected def duplicate(elements: List[String]): Self
 
-  def parent(n: Int = 1): Self =
+  final def parent(n: Int = 1): Self =
     this.duplicate(elements = elements.dropRight(n))
 
-  def child(name: String): Self =
+  final def child(name: String): Self =
     this.duplicate(elements = elements ++ sanitize(name).toList)
-
-  override def children(names: String*): Self =
-    this.duplicate(elements = elements ++ names.flatMap(sanitize))
 }

modules/io/src/main/scala/com/kevel/apso/io/S3FileDescriptor.scala

@@ -77,15 +77,6 @@ case class S3FileDescriptor(
 
   def stream(offset: Long = 0L) = bucket.stream(builtPath, offset)
 
-  override def cd(pathString: String): S3FileDescriptor = {
-    val newPath = pathString.split("/").map(_.trim).toList.foldLeft(elements) {
-      case (acc, "." | "") => acc
-      case (acc, "..")     => acc.dropRight(1)
-      case (acc, segment)  => acc :+ segment
-    }
-    this.copy(elements = newPath)
-  }
-
   override def list: Iterator[S3FileDescriptor] = {
     val prefix = elements.mkString("/")
     bucket
@@ -105,10 +96,6 @@ case class S3FileDescriptor(
     bucket.getObjectsWithMatchingPrefix(buildPath(elements :+ prefix), includeDirectories)
   }
 
-  override def sibling(f: String => String): S3FileDescriptor = {
-    S3FileDescriptor(bucket, elements.dropRight(1) :+ f(name))
-  }
-
   private lazy val isDirectoryRemote = {
     // the bucket itself is considered a directory
     if (elements.isEmpty) true