From 7b8cd2ab60dea2dc67beceb60628330a5d80c7bd Mon Sep 17 00:00:00 2001 From: Matthew Adams Date: Tue, 11 Feb 2014 09:17:04 -0600 Subject: [PATCH] DATACASS-91 - aligning terminology --- .../CassandraMappingContextFactoryBean.java | 24 +++++++++---------- ...tractSpringDataCassandraConfiguration.java | 10 ++++---- .../xml/CassandraMappingContextParser.java | 4 ++-- .../DefaultCassandraMappingContext.java | 4 ++-- .../cassandra/config/spring-cassandra-1.0.xsd | 2 +- ...tRepositoryJavaConfigIntegrationTests.java | 2 +- ...rRepositoryJavaConfigIntegrationTests.java | 2 +- .../template/CassandraDataOperationsTest.java | 2 +- ...itoryXmlConfigIntegrationTests-context.xml | 2 +- ...itoryXmlConfigIntegrationTests-context.xml | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingContextFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingContextFactoryBean.java index 2489a7ad9..5fc72ddf0 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingContextFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingContextFactoryBean.java @@ -12,9 +12,9 @@ import org.springframework.util.Assert; public class CassandraMappingContextFactoryBean implements FactoryBean, InitializingBean { - protected Set basePackages = new HashSet(); + protected Set entityBasePackages = new HashSet(); protected Mapping mapping; - protected ClassLoader entityClassLoader; + protected ClassLoader beanClassLoader; @Override public void afterPropertiesSet() throws Exception { @@ -25,9 +25,9 @@ public class CassandraMappingContextFactoryBean implements FactoryBean getBasePackages() { - return basePackages; + public Set getEntityBasePackages() { + return entityBasePackages; } - public void setBasePackages(Set basePackages) { - this.basePackages = basePackages == null ? new HashSet() : new HashSet(basePackages); + public void setEntityBasePackages(Set basePackages) { + this.entityBasePackages = basePackages == null ? new HashSet() : new HashSet(basePackages); } public Mapping getMapping() { @@ -63,11 +63,11 @@ public class CassandraMappingContextFactoryBean implements FactoryBeanthis.getClass().getPackage().getName()). This method must never return null. */ - public String[] getMappingBasePackages() { + public String[] getEntityBasePackages() { return new String[] { getClass().getPackage().getName() }; } @@ -97,8 +97,8 @@ public abstract class AbstractSpringDataCassandraConfiguration extends AbstractC public CassandraMappingContextFactoryBean cassandraMapping() throws ClassNotFoundException { CassandraMappingContextFactoryBean bean = new CassandraMappingContextFactoryBean(); - bean.setBasePackages(new HashSet(Arrays.asList(getMappingBasePackages()))); - bean.setEntityClassLoader(beanClassLoader); + bean.setEntityBasePackages(new HashSet(Arrays.asList(getEntityBasePackages()))); + bean.setBeanClassLoader(beanClassLoader); return bean; } @@ -118,7 +118,7 @@ public abstract class AbstractSpringDataCassandraConfiguration extends AbstractC /** * Scans the mapping base package for entity classes. * - * @see #getMappingBasePackages() + * @see #getEntityBasePackages() * @see #getEntityScanner() * @return Set<Class<?>> representing the annotated entity classes found. * @throws ClassNotFoundException @@ -126,7 +126,7 @@ public abstract class AbstractSpringDataCassandraConfiguration extends AbstractC protected Set> getInitialEntitySet() throws ClassNotFoundException { CassandraEntityClassScanner entityScanner = getEntityScanner(); - entityScanner.setEntityBasePackages(Arrays.asList(getMappingBasePackages())); + entityScanner.setEntityBasePackages(Arrays.asList(getEntityBasePackages())); return entityScanner.scanForEntityClasses(); } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraMappingContextParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraMappingContextParser.java index ee3991c39..a7e0cf95e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraMappingContextParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraMappingContextParser.java @@ -46,13 +46,13 @@ public class CassandraMappingContextParser extends AbstractSimpleBeanDefinitionP protected void parseBasePackagesAttribute(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { - String basePackages = element.getAttribute("base-packages"); + String basePackages = element.getAttribute("entity-base-packages"); if (!StringUtils.hasText(basePackages)) { return; } Set basePackageSet = StringUtils.commaDelimitedListToSet(basePackages); - builder.addPropertyValue("basePackages", basePackageSet); + builder.addPropertyValue("entityBasePackages", basePackageSet); } protected void parseMapping(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/DefaultCassandraMappingContext.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/DefaultCassandraMappingContext.java index 02417f1fd..b3bb25d5d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/DefaultCassandraMappingContext.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/DefaultCassandraMappingContext.java @@ -37,6 +37,7 @@ import org.springframework.data.mapping.model.MappingException; import org.springframework.data.mapping.model.SimpleTypeHolder; import org.springframework.data.util.TypeInformation; import org.springframework.util.Assert; +import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; import com.datastax.driver.core.TableMetadata; @@ -260,8 +261,7 @@ public class DefaultCassandraMappingContext extends String entityClassName = entityMapping.getEntityClassName(); Class entityClass; try { - entityClass = Class.forName(entityClassName, false, beanClassLoader == null ? getClass().getClassLoader() - : beanClassLoader); + entityClass = ClassUtils.forName(entityClassName, beanClassLoader); } catch (ClassNotFoundException e) { throw new IllegalStateException(String.format("unknown persistent entity name [%s]", entityClassName), e); } diff --git a/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.0.xsd b/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.0.xsd index 1f784ee6c..40e8a3b54 100644 --- a/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.0.xsd +++ b/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.0.xsd @@ -702,7 +702,7 @@ Defines a CassandraMappingContext for holding rich entity mapping information. - + entity-base-packages="org.springframework.data.cassandra.test.integration.composites"> diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/UserRepositoryXmlConfigIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/UserRepositoryXmlConfigIntegrationTests-context.xml index 656c0a620..418d3d343 100644 --- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/UserRepositoryXmlConfigIntegrationTests-context.xml +++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/UserRepositoryXmlConfigIntegrationTests-context.xml @@ -13,7 +13,7 @@ + entity-base-packages="org.springframework.data.cassandra.test.integration.repository">