test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-05 04:38:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Trim field names in @NamePattern parsing #PL-4165

Browse Source
This commit is contained in:
Yuriy Artamonov 2014-08-01 11:51:54 +00:00
parent cbacecaf61
commit 942dab32ae
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/global/src/com/haulmont/cuba/core/global/MetadataTools.java
View File

@ -304,20 +304,24 @@ public class MetadataTools {
String pattern = (String) metaClass.getAnnotations().get(NamePattern.class.getName());
if (pattern == null && useOriginal) {
MetaClass original = metadata.getExtendedEntities().getOriginalMetaClass(metaClass);
if (original != null)
if (original != null) {
pattern = (String) original.getAnnotations().get(NamePattern.class.getName());
}
}
if (!StringUtils.isBlank(pattern)) {
String value = StringUtils.substringAfter(pattern, "|");
String[] fields = StringUtils.splitPreserveAllTokens(value, ",");
for (String field : fields) {
MetaProperty property = metaClass.getProperty(field);
if (property != null)
properties.add(metaClass.getProperty(field));
else
String fieldName = StringUtils.trim(field);
MetaProperty property = metaClass.getProperty(fieldName);
if (property != null) {
properties.add(metaClass.getProperty(fieldName));
} else {
throw new DevelopmentException(
String.format("Property '%s' is not found in %s", field, metaClass.toString()),
"NamePattern", pattern);
}
}
}
return properties;