Formatting

avantgardnerio · Oct 30, 2018 · 94b5ae0 · 94b5ae0
1 parent a8a7ece
commit 94b5ae0
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/src/main/kotlin/net/squarelabs/depends/Resolver.kt b/src/main/kotlin/net/squarelabs/depends/Resolver.kt
@@ -4,26 +4,28 @@ import com.google.common.reflect.ClassPath
 import net.squarelabs.depends.models.Artifact
 import net.squarelabs.depends.models.Class
 import org.jboss.shrinkwrap.resolver.api.maven.Maven
+import java.io.File
 import java.net.URLClassLoader
 
 fun resolve(coordinate: String, cache: HashMap<String, Artifact> = HashMap()): Artifact {
-    return cache.computeIfAbsent(coordinate) { coordinate ->
+    return cache.computeIfAbsent(coordinate) {
         val artifacts = Maven.resolver()
-                .resolve(coordinate)
+                .resolve(it)
                 .withoutTransitivity()
                 .asResolvedArtifact()
         assert(artifacts.size == 1)
         val artifact = artifacts[0]
         val file = artifact.asFile()
-        val classes = URLClassLoader(arrayOf(file.toURL())).use { it ->
-            println("${cache.size} artifacts + ${file.absolutePath}")
-            val cp = ClassPath.from(it)
-            cp.topLevelClasses.map { Class(it.name) }
-        }
-        val dependencies: List<Artifact> = artifact.dependencies.map {
-            //println("resolving ${it.coordinate}")
-            resolve(it.coordinate.toCanonicalForm(), cache)
-        }
-        Artifact(coordinate, file, dependencies, classes)
+        println("${cache.size} artifacts + ${file.absolutePath}")
+        val classes = classesFromFile(file)
+        val dependencies = artifact.dependencies.map { resolve(it.coordinate.toCanonicalForm(), cache) }
+        Artifact(it, file, dependencies, classes)
+    }
+}
+
+fun classesFromFile(file: File): List<Class> {
+    return URLClassLoader(arrayOf(file.toURL())).use { it ->
+        val cp = ClassPath.from(it)
+        cp.topLevelClasses.map { Class(it.name) }
     }
 }