Adding null tests, standardize returns Option[String]

Author: Subba Rao

util-core/src/main/scala/com/indix/utils/core/MPN.scala

@@ -15,7 +15,7 @@ object MPN {
 
   def isValidIdentifier(input: String): Boolean = {
     input match {
-      case _ if input.length > MaxLen || input.length < MinLen => false
+      case _ if StringUtils.isBlank(input) || input.length > MaxLen || input.length < MinLen => false
       case _ if input.count(c => TerminateChars.contains(c)) > 1 => false
       case _ if BlackListedMpns.contains(input.toLowerCase) => false
       case _ if isTitleCase(input) => false
@@ -31,13 +31,14 @@ object MPN {
     else words.forall(w => w == WordUtils.capitalizeFully(w) && !StringUtils.isNumeric(w))
   }
 
-  def standardizeMPN(input: String): String = {
+  def standardizeMPN(input: String): Option[String] = {
     if (isValidIdentifier(input)) {
-      input
+      Some(input)
+    } else if (StringUtils.isBlank(input)) {
+      None
+    } else if (input.indexWhere(c => TerminateChars.contains(c)) > 0) {
+      Some(input.substring(0, input.indexWhere(c => TerminateChars.contains(c))))
     }
-    else if (input.indexWhere(c => TerminateChars.contains(c)) > 0) {
-      input.substring(0, input.indexWhere(c => TerminateChars.contains(c)))
-    }
-    else ""
+    else None
   }
 }

util-core/src/test/scala/com/indix/utils/core/MPNSpec.scala

@@ -17,6 +17,7 @@ class MPNSpec extends FlatSpec with Matchers {
   }
 
   it should "validate identifier" in {
+    MPN.isValidIdentifier(null) should be (false)
     MPN.isValidIdentifier("") should be (false)
     MPN.isValidIdentifier("51") should be (false)
     MPN.isValidIdentifier("NA") should be (false)
@@ -31,10 +32,12 @@ class MPNSpec extends FlatSpec with Matchers {
   }
 
   it should "standardize MPN" in {
-    MPN.standardizeMPN("Does not apply") should be ("")
-    MPN.standardizeMPN("PJS2V") should be ("PJS2V")
-    MPN.standardizeMPN("105200010437-07-70% All Windows") should be ("105200010437-07-70")
-    MPN.standardizeMPN("30634190, 30753839, 31253006") should be ("30634190")
+    MPN.standardizeMPN(null) should be (None)
+    MPN.standardizeMPN("Does not apply") should be (None)
+    MPN.standardizeMPN("PJS2V") should be (Some("PJS2V"))
+
+    MPN.standardizeMPN("105200010437-07-70% All Windows") should be (Some("105200010437-07-70"))
+    MPN.standardizeMPN("30634190, 30753839, 31253006") should be (Some("30634190"))
   }
 
 }