Cleanup

Author: joshafeinberg

affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetector.kt

@@ -589,7 +589,9 @@ class AffectedModuleDetectorImpl(
      * original changedProjects. Always build is still here to ensure at least 1 thing is built
      */
     private fun findDependentProjects(): Set<ProjectPath> {
-        return changedProjects.flatMap { dependencyTracker.findAllDependents(it) }.toSet()
+        return changedProjects.flatMap { path ->
+            dependencyTracker.findAllDependents(path)
+        }.toSet()
     }
 
     /**

affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/DependencyTracker.kt

@@ -55,9 +55,9 @@ class DependencyTracker(private val rootProject: Project, private val logger: Lo
     fun findAllDependents(projectPath: ProjectPath): Set<ProjectPath> {
         logger?.info("finding dependents of $projectPath")
         val result = mutableSetOf<ProjectPath>()
-        fun addAllDependents(path: ProjectPath) {
-            if (result.add(path)) {
-                dependentList[path]?.forEach(::addAllDependents)
+        fun addAllDependents(projectPath: ProjectPath) {
+            if (result.add(projectPath)) {
+                dependentList[projectPath]?.forEach(::addAllDependents)
             }
         }
         addAllDependents(projectPath)

affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/ProjectGraph.kt

@@ -54,10 +54,8 @@ class ProjectGraph(project: Project, logger: Logger? = null) : Serializable {
             val realSections = sections.filter { section -> section != ".." }
 
             logger?.info("relative path: $relativePath , sections: $realSections")
-            val leaf = realSections.fold(rootNode) { left, right ->
-                left.getOrCreateNode(right)
-            }
-            leaf.projectPath = it.path
+            val leaf = realSections.fold(rootNode) { left, right -> left.getOrCreateNode(right) }
+            leaf.projectPath = it.projectPath
         }
         logger?.info("finished creating ProjectGraph")
     }
@@ -69,24 +67,24 @@ class ProjectGraph(project: Project, logger: Logger? = null) : Serializable {
     fun findContainingProject(filePath: String, logger: Logger? = null): ProjectPath? {
         val sections = filePath.split(File.separatorChar)
         logger?.info("finding containing project for $filePath , sections: $sections")
-        return rootNode.find(sections, 0, logger)?.let { ProjectPath(it) }
+        return rootNode.find(sections, 0, logger)
     }
 
     val allProjects by lazy {
-        val result = mutableSetOf<String>()
+        val result = mutableSetOf<ProjectPath>()
         rootNode.addAllProjectPaths(result)
-        result.map { ProjectPath(it) }.toSet()
+        result
     }
 
     private class Node() : Serializable {
-        var projectPath: String? = null
+        var projectPath: ProjectPath? = null
         private val children = mutableMapOf<String, Node>()
 
         fun getOrCreateNode(key: String): Node {
             return children.getOrPut(key) { Node() }
         }
 
-        fun find(sections: List<String>, index: Int, logger: Logger?): String? {
+        fun find(sections: List<String>, index: Int, logger: Logger?): ProjectPath? {
             if (sections.size <= index) {
                 logger?.info("nothing")
                 return projectPath
@@ -100,7 +98,7 @@ class ProjectGraph(project: Project, logger: Logger? = null) : Serializable {
             }
         }
 
-        fun addAllProjectPaths(collection: MutableSet<String>) {
+        fun addAllProjectPaths(collection: MutableSet<ProjectPath>) {
             projectPath?.let { path -> collection.add(path) }
             for (child in children.values) {
                 child.addAllProjectPaths(collection)
@@ -109,7 +107,7 @@ class ProjectGraph(project: Project, logger: Logger? = null) : Serializable {
     }
 
     fun getRootProjectPath(): ProjectPath? {
-        return rootNode.projectPath?.let { ProjectPath(it) }
+        return rootNode.projectPath
     }
 }