From 2b9533e011d31d15622faad13b9f9a6841394e27 Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Fri, 15 Jan 2016 02:12:19 +0400
Subject: [PATCH] Clean up Strings.

---
 .../kotlin/com/beust/kobalt/maven/LocalDep.kt    | 11 +----------
 .../kotlin/com/beust/kobalt/maven/RepoFinder.kt  |  7 +++++--
 .../com/beust/kobalt/maven/UnversionedDep.kt     |  3 +--
 .../main/kotlin/com/beust/kobalt/misc/Strings.kt | 16 ----------------
 4 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/LocalDep.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/LocalDep.kt
index 0816b953..baebac31 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/LocalDep.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/LocalDep.kt
@@ -1,18 +1,9 @@
 package com.beust.kobalt.maven
 
-import com.beust.kobalt.maven.CompletedFuture
-import com.beust.kobalt.misc.Strings
-import java.io.File
-import java.util.concurrent.Future
-import kotlin.properties.Delegates
-
 open public class LocalDep(override val mavenId: MavenId, open val localRepo: LocalRepo)
         : SimpleDep(mavenId) {
 
     fun toAbsoluteJarFilePath(v: String) = localRepo.toFullPath(toJarFile(v))
 
-    fun toAbsolutePomFile(v: String): String {
-        return localRepo.toFullPath(Strings.Companion.join("/", arrayListOf(toPomFile(v))))
-    }
-
+    fun toAbsolutePomFile(v: String) = localRepo.toFullPath(listOf(toPomFile(v)).joinToString("/"))
 }
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/RepoFinder.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/RepoFinder.kt
index f6f496ea..6ec4b029 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/RepoFinder.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/RepoFinder.kt
@@ -3,7 +3,10 @@ package com.beust.kobalt.maven
 import com.beust.kobalt.HostConfig
 import com.beust.kobalt.api.Kobalt
 import com.beust.kobalt.maven.dependency.FileDependency
-import com.beust.kobalt.misc.*
+import com.beust.kobalt.misc.KobaltExecutors
+import com.beust.kobalt.misc.Version
+import com.beust.kobalt.misc.log
+import com.beust.kobalt.misc.warn
 import com.google.common.cache.CacheBuilder
 import com.google.common.cache.CacheLoader
 import com.google.common.cache.LoadingCache
@@ -198,7 +201,7 @@ public class RepoFinder @Inject constructor(val executors: KobaltExecutors) {
             val doc = parseXml(url)
             val ts = timestamp.evaluate(doc, XPathConstants.STRING)
             val bn = buildNumber.evaluate(doc, XPathConstants.STRING)
-            if (! Strings.isEmpty(ts.toString()) && ! Strings.isEmpty(bn.toString())) {
+            if (! ts.toString().isEmpty() && ! bn.toString().isEmpty()) {
                 return Version(snapshotVersion, ts.toString() + "-" + bn.toString())
             } else {
                 val lastUpdated = XPATH.compile("/metadata/versioning/lastUpdated")
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/UnversionedDep.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/UnversionedDep.kt
index e573bdb7..40d9c524 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/UnversionedDep.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/UnversionedDep.kt
@@ -1,6 +1,5 @@
 package com.beust.kobalt.maven
 
-import com.beust.kobalt.misc.Strings
 import java.io.File
 
 /**
@@ -24,7 +23,7 @@ open class UnversionedDep(open val groupId: String, open val artifactId: String)
     fun toDirectory(v: String, fileSystem: Boolean = true, trailingSlash: Boolean = true): String {
         val sep = if (fileSystem) File.separator else "/"
         val l = listOf(groupId.replace(".", sep), artifactId, v)
-        val result = Strings.Companion.join(sep, l)
+        val result = l.joinToString(sep)
         return if (trailingSlash && ! result.endsWith(sep)) result + sep else result
     }
 }
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Strings.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Strings.kt
index de701e4e..bc971959 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Strings.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Strings.kt
@@ -4,22 +4,6 @@ import com.google.common.base.CharMatcher
 
 public class Strings {
     companion object {
-        fun <T> join(separator: String, strings: List<T>) : String {
-            var result = StringBuffer()
-            var i = 0
-            strings.forEach {
-                if (i++ > 0) {
-                    result.append(separator)
-                }
-                result.append(it)
-            }
-            return result.toString()
-        }
-
-        fun isEmpty(s: String?): Boolean {
-            return s == null || s.isEmpty()
-        }
-
         fun pluralize(s: String, n: Int) = s + (if (n != 1) "s" else "")
     }