Spring/spring-data-cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATCASS-93 - now using SpelUtils

Browse Source
This commit is contained in:
Matthew Adams
2014-02-19 11:42:40 -06:00
parent 2e29676b7a
commit 7ae8aa63d2
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntity.java
View File

@@ -27,6 +27,7 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.expression.BeanFactoryAccessor;
import org.springframework.context.expression.BeanFactoryResolver;
import org.springframework.data.cassandra.util.SpelUtils;
import org.springframework.data.mapping.Association;
import org.springframework.data.mapping.AssociationHandler;
import org.springframework.data.mapping.PropertyHandler;
@@ -98,10 +99,7 @@ public class BasicCassandraPersistentEntity<T> extends BasicPersistentEntity<T,
return cqlId(getType().getSimpleName(), anno == null ? false : anno.forceQuote());
}
Expression expression = spelParser.parseExpression(anno.value(), ParserContext.TEMPLATE_EXPRESSION);
String tableName = expression.getValue(spelContext, String.class);
return cqlId(tableName, anno.forceQuote());
return cqlId(SpelUtils.evaluate(anno.value(), spelContext), anno.forceQuote());
}
@Override