From 57f54be654551badf20970d93123ffb500b69e1c Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Mon, 12 Oct 2015 20:30:07 -0700 Subject: [PATCH] Code clean up. --- .../kotlin/com/beust/kobalt/maven/ArtifactFetcher.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/maven/ArtifactFetcher.kt b/src/main/kotlin/com/beust/kobalt/maven/ArtifactFetcher.kt index 18fb6497..112a90fd 100644 --- a/src/main/kotlin/com/beust/kobalt/maven/ArtifactFetcher.kt +++ b/src/main/kotlin/com/beust/kobalt/maven/ArtifactFetcher.kt @@ -1,9 +1,7 @@ package com.beust.kobalt.maven -import com.beust.kobalt.file import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KobaltLogger -import com.beust.kobalt.plugin.packaging.JarUtils import com.google.common.cache.CacheBuilder import com.google.common.cache.CacheLoader import com.google.common.cache.LoadingCache @@ -66,14 +64,14 @@ class ArtifactFetcher @Inject constructor(@Assisted("url") val url: String, } private fun getBytes(url: String) : ByteArray { - log(2, "${url}: downloading to ${fileName}") + log(2, "$url: downloading to $fileName") val body = http.get(url) if (body.code == 200) { val buffer = ByteArrayOutputStream(estimatedSize) body.getAsStream().copyTo(buffer, estimatedSize) return buffer.toByteArray() } else { - throw KobaltException("${url}: failed to download, code: ${body.code}") + throw KobaltException("$url: failed to download, code: ${body.code}") } } @@ -89,9 +87,9 @@ class ArtifactFetcher @Inject constructor(@Assisted("url") val url: String, file.parentFile.mkdirs() val bytes = getBytes(url) if (remoteMd5 != null && remoteMd5 != toMd5(bytes)) { - throw KobaltException("MD5 not matching for ${url}") + throw KobaltException("MD5 not matching for $url") } else { - log(2, "No md5 found for ${url}, skipping md5 check") + log(2, "No md5 found for $url, skipping md5 check") } files.saveFile(file, bytes)