Revision f33355c3
Added by Andreas Müller over 3 years ago
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/agent/PersonDefaultCacheStrategy.java | ||
---|---|---|
13 | 13 |
import java.util.regex.Matcher; |
14 | 14 |
import java.util.regex.Pattern; |
15 | 15 |
|
16 |
import org.apache.commons.lang.StringUtils; |
|
17 | 16 |
import org.apache.log4j.Logger; |
18 | 17 |
|
19 | 18 |
import eu.etaxonomy.cdm.common.CdmUtils; |
... | ... | |
128 | 127 |
public String getInitialsFromGivenName(String givenname, boolean forceOnlyFirstLetter) { |
129 | 128 |
if (givenname == null){ |
130 | 129 |
return null; |
131 |
}else if (StringUtils.isBlank(givenname)){
|
|
130 |
}else if (isBlank(givenname)){ |
|
132 | 131 |
return ""; |
133 | 132 |
} |
134 | 133 |
//remove brackets |
... | ... | |
141 | 140 |
String[] splits = givenname.split("((?<=\\.)|\\s+|(?=([\\-\u2013])))+"); // [\\-\u2013]? // (?!=\\s) wasn't successful to trim |
142 | 141 |
for (String split : splits){ |
143 | 142 |
split = split.trim(); |
144 |
if (StringUtils.isBlank(split) || split.matches("\\(.*\\)")){ //again checking brackets not really necessary
|
|
143 |
if (isBlank(split) || split.matches("\\(.*\\)")){ //again checking brackets not really necessary |
|
145 | 144 |
continue; |
146 | 145 |
} |
147 | 146 |
if (split.matches("^[\\-\u2013].*")){ |
148 | 147 |
result += split.substring(0, 1); |
149 | 148 |
split = split.substring(1); |
150 |
if (StringUtils.isBlank(split)){
|
|
149 |
if (isBlank(split)){ |
|
151 | 150 |
continue; |
152 | 151 |
} |
153 | 152 |
} |
Also available in: Unified diff
ref #9204 remove commons-lang2 from cdmlib dependencies