Skip to content

Commit cba2036

Browse files
maltekmpollmeier
authored andcommitted
ZipArchive: don't return results as linked list
1 parent ee64f24 commit cba2036

File tree

1 file changed

+6
-5
lines changed
  • codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading

1 file changed

+6
-5
lines changed

codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/ZipArchive.scala

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@ package io.shiftleft.codepropertygraph.cpgloading
22

33
import java.io.Closeable
44
import java.nio.file.attribute.BasicFileAttributes
5-
import java.nio.file.{FileSystem, FileSystems, FileVisitResult, Files, Path, Paths, SimpleFileVisitor}
6-
import java.util.{Collection => JCollection}
5+
import java.nio.file.{FileSystem, FileSystems, FileVisitOption, FileVisitResult, Files, Path, Paths, SimpleFileVisitor}
6+
import java.util.Collection as JCollection
7+
import scala.collection.immutable.ArraySeq
78
import scala.collection.mutable.ArrayBuffer
8-
import scala.jdk.CollectionConverters._
9+
import scala.jdk.CollectionConverters.*
910

1011
class ZipArchive(inputFile: String) extends Closeable {
1112
private val zipFileSystem: FileSystem = FileSystems.newFileSystem(Paths.get(inputFile), null: ClassLoader)
1213

1314
private def root: Path = zipFileSystem.getRootDirectories.iterator.next
1415

1516
private def walk(rootPath: Path): Seq[Path] = {
16-
val entries = ArrayBuffer[Path]()
17+
val entries = ArraySeq.newBuilder[Path]()
1718
Files.walkFileTree(
1819
rootPath,
1920
new SimpleFileVisitor[Path]() {
@@ -24,7 +25,7 @@ class ZipArchive(inputFile: String) extends Closeable {
2425
}
2526
}
2627
)
27-
entries.toSeq
28+
entries.result()
2829
}
2930

3031
def entries: Seq[Path] = walk(root)

0 commit comments

Comments
 (0)