bugfix in NonViralNameDefaultCacheStrategy for trailing whitespace #621

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategy.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategy.java
index 15512b9c8527f2c3b1cf0bdbbc54e343793fef36..00cf6cffc94b58ff9ccc7ad7680956855d63b958 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategy.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategy.java
@@ -422,7 +422,7 @@ public class NonViralNameDefaultCacheStrategy<T extends NonViralName> extends Na
                protected String getGenusOrUninomialNameCache(NonViralName nonViralName){\r
                        String result;\r
                        result = CdmUtils.Nz(nonViralName.getGenusOrUninomial());\r
-                       result = addAppendedPhrase(result, nonViralName);\r
+                       result = addAppendedPhrase(result, nonViralName).trim();\r
                        return result;\r
                }\r
                \r
@@ -442,7 +442,7 @@ public class NonViralNameDefaultCacheStrategy<T extends NonViralName> extends Na
                        }\r
                        result = CdmUtils.Nz(nonViralName.getGenusOrUninomial());\r
                        result += " " + infraGenericMarker + " " + (CdmUtils.Nz(nonViralName.getInfraGenericEpithet())).trim().replace("null", "");\r
-                       result = addAppendedPhrase(result, nonViralName);\r
+                       result = addAppendedPhrase(result, nonViralName).trim();\r
                        return result;\r
                }\r
 \r
@@ -458,7 +458,7 @@ public class NonViralNameDefaultCacheStrategy<T extends NonViralName> extends Na
                                marker = "'unknown aggregat type'";\r
                        }\r
                        result += " " + marker;\r
-                       result = addAppendedPhrase(result, nonViralName);\r
+                       result = addAppendedPhrase(result, nonViralName).trim();\r
                        return result;\r
                }\r
                \r
@@ -484,7 +484,7 @@ public class NonViralNameDefaultCacheStrategy<T extends NonViralName> extends Na
                                result += " " + (nonViralName.getRank().getAbbreviation()).trim().replace("null", "");\r
                        }\r
                        result += " " + (CdmUtils.Nz(nonViralName.getInfraSpecificEpithet())).trim().replace("null", "");\r
-                       result = addAppendedPhrase(result, nonViralName);\r
+                       result = addAppendedPhrase(result, nonViralName).trim();\r
                        return result;\r
                }\r
 \r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java
index a915b3bce77fff1016e4ff10f92621a8c83faea3..e786507cde45818234fcf4798941b4989d13f1e9 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java
@@ -127,6 +127,11 @@ public class NonViralNameDefaultCacheStrategyTest {
                botName.setSpecificEpithet("tenue");\r
                botName.setInfraSpecificEpithet("tenue");\r
                assertEquals("", "Lepidocaryum tenue var. tenue", botName.getNameCache());\r
+               BotanicalName specName = BotanicalName.NewInstance(Rank.SPECIES());\r
+               specName.setGenusOrUninomial("Genus");\r
+               specName.setSpecificEpithet("");\r
+               assertEquals("Empty species string must not result in trailing whitespace", "Genus", specName.getNameCache());\r
+               \r
        }\r
 \r
        /**\r