From 7ae8aa63d2b4800344d768586c042da21729f97f Mon Sep 17 00:00:00 2001
From: Matthew Adams <matthew@matthewadams.me>
Date: Wed, 19 Feb 2014 11:42:40 -0600
Subject: [PATCH] DATCASS-93 - now using SpelUtils

---
 .../cassandra/mapping/BasicCassandraPersistentEntity.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntity.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntity.java
index f3707f3f0..22cfce2ac 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntity.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/BasicCassandraPersistentEntity.java
@@ -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