erik/akismet-kotlin
erik/akismet-kotlin
1
1
Fork 0
Code Issues Pull requests Releases Activity

Added ifNull() extension function.

Browse source
This commit is contained in:
Erik C. Thauvin 2019-09-24 16:52:49 -07:00
parent 697e74da79
commit 0e6d9921f6
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main/kotlin/net/thauvin/erik/akismet/AkismetComment.kt
View file

@ -185,8 +185,8 @@ open class AkismetComment(val userIp: String, val userAgent: String) {
* *
* @see [serverEnv] * @see [serverEnv]
*/ */
constructor(request: HttpServletRequest) : this(request.remoteAddr, request.getNonNullHeader("User-Agent")) { constructor(request: HttpServletRequest) : this(request.remoteAddr.ifNull(), request.getHeader("User-Agent").ifNull()) {
referrer = request.getNonNullHeader("referer") referrer = request.getHeader("referer").ifNull()
serverEnv = buildServerEnv(request) serverEnv = buildServerEnv(request)
} }
@ -268,17 +268,16 @@ private fun buildServerEnv(request: HttpServletRequest): HashMap<String, String>
while (names.hasMoreElements()) { while (names.hasMoreElements()) {
val name = names.nextElement() val name = names.nextElement()
if (!name.equals("cookie", true)) { if (!name.equals("cookie", true)) {
params["HTTP_${name.toUpperCase().replace('-', '_')}"] = request.getNonNullHeader(name) params["HTTP_${name.toUpperCase().replace('-', '_')}"] = request.getHeader(name).ifNull()
} }
} }
return params return params
} }
private fun HttpServletRequest.getNonNullHeader(name: String): String { private fun String.ifNull(): String {
val header = getHeader(name) if (this == null) {
if (header != null) { return ""
return header
} }
return "" return this
} }