From 879e3152fc793b4628550615cbeb26edd5497954 Mon Sep 17 00:00:00 2001
From: Graham <gpe@openrs2.dev>
Date: Sun, 15 Dec 2019 16:33:45 +0000
Subject: [PATCH] Convert StringUtils to Kotlin

---
 .editorconfig                                 |  4 +++
 .idea/codeStyles/Project.xml                  |  6 ++++
 util/pom.xml                                  |  4 +++
 .../java/dev/openrs2/util/StringUtils.java    | 29 -------------------
 .../main/java/dev/openrs2/util/StringUtils.kt | 20 +++++++++++++
 5 files changed, 34 insertions(+), 29 deletions(-)
 delete mode 100644 util/src/main/java/dev/openrs2/util/StringUtils.java
 create mode 100644 util/src/main/java/dev/openrs2/util/StringUtils.kt

diff --git a/.editorconfig b/.editorconfig
index f7ea641f38..2e04c11efc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,6 +7,10 @@ trim_trailing_whitespace = true
 max_line_length = 120
 indent_style = tab
 
+[*.kt]
+indent_style = space
+indent_size = 4
+
 [*.xml]
 indent_style = space
 indent_size = 2
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index a95768fb54..aa60d1c615 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -36,6 +36,9 @@
       <option name="JD_ADD_BLANK_AFTER_DESCRIPTION" value="false" />
       <option name="JD_INDENT_ON_CONTINUATION" value="true" />
     </JavaCodeStyleSettings>
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
     <XML>
       <option name="XML_ATTRIBUTE_WRAP" value="0" />
       <option name="XML_ALIGN_ATTRIBUTES" value="false" />
@@ -75,5 +78,8 @@
         <option name="TAB_SIZE" value="2" />
       </indentOptions>
     </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/util/pom.xml b/util/pom.xml
index 9f66cc6537..236e2afdcd 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -23,6 +23,10 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
diff --git a/util/src/main/java/dev/openrs2/util/StringUtils.java b/util/src/main/java/dev/openrs2/util/StringUtils.java
deleted file mode 100644
index a3913c1c1f..0000000000
--- a/util/src/main/java/dev/openrs2/util/StringUtils.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package dev.openrs2.util;
-
-import com.google.common.base.Preconditions;
-
-public final class StringUtils {
-	public static String indefiniteArticle(String str) {
-		Preconditions.checkArgument(!str.isEmpty());
-
-		var first = Character.toLowerCase(str.charAt(0));
-		if (first == 'a' || first == 'e' || first == 'i' || first == 'o' || first == 'u') {
-			return "an";
-		} else {
-			return "a";
-		}
-	}
-
-	public static String capitalize(String str) {
-		if (str.isEmpty()) {
-			return str;
-		}
-
-		var first = Character.toUpperCase(str.charAt(0));
-		return first + str.substring(1);
-	}
-
-	private StringUtils() {
-		/* empty */
-	}
-}
diff --git a/util/src/main/java/dev/openrs2/util/StringUtils.kt b/util/src/main/java/dev/openrs2/util/StringUtils.kt
new file mode 100644
index 0000000000..e9be44a7d8
--- /dev/null
+++ b/util/src/main/java/dev/openrs2/util/StringUtils.kt
@@ -0,0 +1,20 @@
+package dev.openrs2.util
+
+object StringUtils {
+    // TODO(gpe): convert to an extension function
+    @JvmStatic
+    fun indefiniteArticle(str: String): String {
+        require(str.isNotEmpty())
+
+        val first = str.first().toLowerCase()
+        return when (first) {
+            'a', 'e', 'i', 'o', 'u' -> "an"
+            else -> "a"
+        }
+    }
+
+    @JvmStatic
+    fun capitalize(str: String): String {
+        return str.capitalize()
+    }
+}