fix #9675 handling for empty initials (cont.)

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/agent/PersonDefaultCacheStrategy.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/agent/PersonDefaultCacheStrategy.java
index 35ee5625fa8c26a7087c063b1f0a671e073684a9..6f95538e037780fc57639bbafb94d11257db4350 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/agent/PersonDefaultCacheStrategy.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/agent/PersonDefaultCacheStrategy.java
@@ -136,7 +136,7 @@ public class PersonDefaultCacheStrategy
         if (givenname == null){\r
             return null;\r
         }else if (isBlank(givenname)){\r
-            return "";\r
+            return null;\r
         }\r
         //remove brackets\r
         final String regex = "\\([^)]*\\)";\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/agent/PersonDefaultCacheStrategyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/agent/PersonDefaultCacheStrategyTest.java
index be83fd3591f11b1aaab9e3a0ceb297ce91f2767b..a4577959794a38f10b68b2228a8ef510151349ef 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/agent/PersonDefaultCacheStrategyTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/agent/PersonDefaultCacheStrategyTest.java
@@ -150,10 +150,10 @@ public class PersonDefaultCacheStrategyTest {
         Assert.assertNull(formatter.getInitialsFromGivenName(givenname, force));\r
 \r
         givenname = "";\r
-        Assert.assertEquals("", formatter.getInitialsFromGivenName(givenname, force));\r
+        Assert.assertNull(formatter.getInitialsFromGivenName(givenname, force));\r
 \r
         givenname = "  ";\r
-        Assert.assertEquals("We expect blanks to be trimmed", "", formatter.getInitialsFromGivenName(givenname, force));\r
+        Assert.assertNull("We expect blanks to be trimmed", formatter.getInitialsFromGivenName(givenname, force));\r
 \r
            givenname = "John Michael ";\r
            Assert.assertEquals("J.M.", formatter.getInitialsFromGivenName(givenname, force));\r
@@ -259,9 +259,5 @@ public class PersonDefaultCacheStrategyTest {
 \r
         givenname = "(Brother)"; //example from Salvador DB\r
         Assert.assertNull("Non-parsable string should not be empty but null", formatter.getInitialsFromGivenName(givenname, force));\r
-\r
-        givenname = " ";\r
-        Assert.assertNull("Empty string should not result in empty string but null", formatter.getInitialsFromGivenName(givenname, force));\r
-\r
        }\r
 }\r