From 2db72fa86758f31f619b514489f420d1b4a5aaa4 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 24 Sep 2019 17:12:01 -0700
Subject: [PATCH] Cleanup.

---
 .../thauvin/erik/akismet/AkismetComment.kt    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/akismet/AkismetComment.kt b/src/main/kotlin/net/thauvin/erik/akismet/AkismetComment.kt
index 93d0178..dd59e27 100644
--- a/src/main/kotlin/net/thauvin/erik/akismet/AkismetComment.kt
+++ b/src/main/kotlin/net/thauvin/erik/akismet/AkismetComment.kt
@@ -37,6 +37,13 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
 import javax.servlet.http.HttpServletRequest
 
+private fun String?.ifNull(): String {
+    if (this == null) {
+        return ""
+    }
+    return this
+}
+
 /**
  * A comment to send to Akismet.
  *
@@ -185,7 +192,10 @@ open class AkismetComment(val userIp: String, val userAgent: String) {
      *
      * @see [serverEnv]
      */
-    constructor(request: HttpServletRequest) : this(request.remoteAddr.ifNull(), request.getHeader("User-Agent").ifNull()) {
+    constructor(request: HttpServletRequest) : this(
+        request.remoteAddr.ifNull(),
+        request.getHeader("User-Agent").ifNull()
+    ) {
         referrer = request.getHeader("referer").ifNull()
         serverEnv = buildServerEnv(request)
     }
@@ -274,10 +284,3 @@ private fun buildServerEnv(request: HttpServletRequest): HashMap<String, String>
 
     return params
 }
-
-private fun String.ifNull(): String {
-    if (this == null) {
-       return ""
-    }
-    return this
-}