Skip to content

[x2cpg] Possible replacement implementation for findSupportedBuildFiles. #5959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ml86 wants to merge 1 commit into
base: master
Choose a base branch
from
+23 −1
Open

[x2cpg] Possible replacement implementation for findSupportedBuildFiles. #5959

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion ...i/frontends/x2cpg/src/main/scala/io/joern/x2cpg/utils/dependency/DependencyResolver.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import FileUtil.*
import org.slf4j.LoggerFactory

import java.nio.file.{Files, Path}
import scala.collection.mutable
import scala.util.{Failure, Success}
import scala.jdk.CollectionConverters.*

enum GradleConfigKeys {
case ProjectName, ConfigurationName
Expand Down Expand Up @@ -106,7 +108,27 @@ object DependencyResolver {
file.toString.endsWith("pom.xml")
}

private def findSupportedBuildFiles(currentDir: Path, depth: Int = 0): List[Path] = {
private def findSupportedBuildFiles(dir: Path, maxDepth: Int = MaxSearchDepth): List[Path] = {
val buildFiles = Files.walk(dir, maxDepth).iterator.asScala.filter { file =>
(!Files.isDirectory(file)) && (isGradleBuildFile(file) || isMavenBuildFile(file))
}.toList

if (buildFiles.isEmpty) {
logger.info("findSupportedBuildFiles reached max depth before finding build files")
}

val old = findSupportedBuildFilesOld(dir)

if (old.sorted != buildFiles.sorted) {
throw new RuntimeException(s"Unequal results: old $old\nnew $buildFiles")
}

logger.info(s"Found $buildFiles")

buildFiles.toList
}

private def findSupportedBuildFilesOld(currentDir: Path, depth: Int = 0): List[Path] = {
if (depth >= MaxSearchDepth) {
logger.info("findSupportedBuildFiles reached max depth before finding build files")
Nil
Expand Down
Loading