String.orEmpty extension

Author: ghik

commons-core/src/main/scala/com/avsystem/commons/SharedExtensions.scala

@@ -187,6 +187,12 @@ object SharedExtensions extends SharedExtensions {
   private val RemovableLineBreak = "\\n+".r
 
   class StringOps(private val str: String) extends AnyVal {
+    /**
+      * Makes sure that `String` value is not `null` by replacing `null` with empty string.
+      */
+    def orEmpty: String =
+      if (str == null) "" else str
+
     def ensureSuffix(suffix: String): String =
       if (str.endsWith(suffix)) str else str + suffix
 

commons-jetty/src/main/scala/com/avsystem/commons/jetty/rest/RestServlet.scala

@@ -27,7 +27,7 @@ object RestServlet {
 
   def readParameters(request: HttpServletRequest): RestParameters = {
     // can't use request.getPathInfo because it decodes the URL before we can split it
-    val pathPrefix = request.getContextPath.opt.getOrElse("") + request.getServletPath.opt.getOrElse("")
+    val pathPrefix = request.getContextPath.orEmpty + request.getServletPath.orEmpty
     val path = PathValue.splitDecode(request.getRequestURI.stripPrefix(pathPrefix))
     val query = request.getQueryString.opt.map(QueryValue.decode).getOrElse(Mapping.empty)
     val headersBuilder = Mapping.newBuilder[HeaderValue]