From 160cbbcfdac70137626869a6906cc6644fec0c5b Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Wed, 6 Jul 2016 00:53:45 -0800 Subject: [PATCH] Optimize splits. --- .../src/main/kotlin/com/beust/kobalt/api/KobaltContext.kt | 2 +- .../main/kotlin/com/beust/kobalt/internal/TaskManager.kt | 4 ++-- .../src/main/kotlin/com/beust/kobalt/maven/MavenId.kt | 2 +- .../src/main/kotlin/com/beust/kobalt/misc/Versions.kt | 4 ++-- src/main/kotlin/com/beust/kobalt/Main.kt | 6 +++--- src/main/kotlin/com/beust/kobalt/app/ProjectGenerator.kt | 2 +- src/main/kotlin/com/beust/kobalt/app/remote/KobaltServer.kt | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/KobaltContext.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/KobaltContext.kt index b55e03fb..1b4ee15c 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/KobaltContext.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/KobaltContext.kt @@ -15,7 +15,7 @@ class KobaltContext(val args: Args) { val profiles = arrayListOf() init { - args.profiles?.split(",")?.filterNotNull()?.forEach { + args.profiles?.split(',')?.filterNotNull()?.forEach { profiles.add(it) } } diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt index 90214710..03b96d8c 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt @@ -53,9 +53,9 @@ class TaskManager @Inject constructor(val args: Args, constructor(project: String, task: String) : this(project + ":" + task) val project: String? - get() = if (id.contains(":")) id.split(":")[0] else null + get() = if (id.contains(':')) id.split(':')[0] else null val taskName: String - get() = if (id.contains(":")) id.split(":")[1] else id + get() = if (id.contains(':')) id.split(':')[1] else id fun matches(projectName: String) = project == null || project == projectName diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/MavenId.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/MavenId.kt index 26161a77..21201f99 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/MavenId.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/MavenId.kt @@ -17,7 +17,7 @@ class MavenId private constructor(val groupId: String, val artifactId: String, v val classifier: String?, val version: String?) { companion object { - fun isMavenId(id: String) = with(id.split(":")) { + fun isMavenId(id: String) = with(id.split(':')) { size >= 3 && size <= 5 } diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Versions.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Versions.kt index 0cb8b397..70e61690 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Versions.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Versions.kt @@ -25,7 +25,7 @@ public class Versions { } return normalizedVersion - .split(".") + .split('.') .take(3) .map { val s = CharMatcher.inRange('0', '9').or(CharMatcher.`is`('.')).retainFrom(it) @@ -107,7 +107,7 @@ class Version(val version: String, val snapshotTimestamp: String? = null): Compa var lowerExclusive = version.startsWith("(") var upperExclusive = version.endsWith(")") - val split = version.drop(1).dropLast(1).split(",") + val split = version.drop(1).dropLast(1).split(',') val lower = Version.of(split[0].substring(1)) val upper = if(split.size > 1) { diff --git a/src/main/kotlin/com/beust/kobalt/Main.kt b/src/main/kotlin/com/beust/kobalt/Main.kt index 17baeda9..3174feb5 100644 --- a/src/main/kotlin/com/beust/kobalt/Main.kt +++ b/src/main/kotlin/com/beust/kobalt/Main.kt @@ -73,10 +73,10 @@ private class Main @Inject constructor( val dependencies = arrayListOf() args.pluginIds?.let { // We want this call to go to the network if no version was specified, so set localFirst to false - dependencies.addAll(it.split(",").map { dependencyManager.create(it) }) + dependencies.addAll(it.split(',').map { dependencyManager.create(it) }) } args.pluginJarFiles?.let { - dependencies.addAll(it.split(",").map { FileDependency(it) }) + dependencies.addAll(it.split(',').map { FileDependency(it) }) } if (dependencies.size > 0) { val urls = dependencies.map { it.jarFile.get().toURI().toURL() } @@ -187,7 +187,7 @@ private class Main @Inject constructor( } } else if (args.dependencies != null) { // --resolve - resolveDependency.run(args.dependencies!!.split(",").toList()) + resolveDependency.run(args.dependencies!!.split(',').toList()) } else if (args.tasks) { // --tasks displayTasks() diff --git a/src/main/kotlin/com/beust/kobalt/app/ProjectGenerator.kt b/src/main/kotlin/com/beust/kobalt/app/ProjectGenerator.kt index 8531d087..7733076e 100644 --- a/src/main/kotlin/com/beust/kobalt/app/ProjectGenerator.kt +++ b/src/main/kotlin/com/beust/kobalt/app/ProjectGenerator.kt @@ -21,7 +21,7 @@ class ProjectGenerator @Inject constructor(val pluginInfo: PluginInfo){ } } - args.templates?.split(",")?.forEach { templateName -> + args.templates?.split(',')?.forEach { templateName -> val template = map[templateName] if (template != null) { log(2, "Running template $templateName") diff --git a/src/main/kotlin/com/beust/kobalt/app/remote/KobaltServer.kt b/src/main/kotlin/com/beust/kobalt/app/remote/KobaltServer.kt index 872ef509..5c696d16 100644 --- a/src/main/kotlin/com/beust/kobalt/app/remote/KobaltServer.kt +++ b/src/main/kotlin/com/beust/kobalt/app/remote/KobaltServer.kt @@ -73,7 +73,7 @@ class KobaltServer @Inject constructor(@Assisted val force: Boolean, @Assisted @ return false } else { val processName = ManagementFactory.getRuntimeMXBean().name - val pid = processName.split("@")[0] + val pid = processName.split('@')[0] Properties().apply { put(KEY_PORT, port.toString()) put(KEY_PID, pid)