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

DATACASS-91 - aligning terminology

Browse Source
This commit is contained in:
Matthew Adams
2014-02-11 09:17:04 -06:00
parent e71c446a3f
commit 7b8cd2ab60
10 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingContextFactoryBean.java
View File

@@ -12,9 +12,9 @@ import org.springframework.util.Assert;
public class CassandraMappingContextFactoryBean implements FactoryBean<CassandraMappingContext>, InitializingBean {
protected Set<String> basePackages = new HashSet<String>();
protected Set<String> entityBasePackages = new HashSet<String>();
protected Mapping mapping;
protected ClassLoader entityClassLoader;
protected ClassLoader beanClassLoader;
@Override
public void afterPropertiesSet() throws Exception {
@@ -25,9 +25,9 @@ public class CassandraMappingContextFactoryBean implements FactoryBean<Cassandra
public CassandraMappingContext getObject() throws Exception {
DefaultCassandraMappingContext mappingContext = new DefaultCassandraMappingContext();
mappingContext.setInitialEntitySet(new CassandraEntityClassScanner(basePackages).scanForEntityClasses());
mappingContext.setInitialEntitySet(new CassandraEntityClassScanner(entityBasePackages).scanForEntityClasses());
mappingContext.setMapping(mapping);
mappingContext.setBeanClassLoader(entityClassLoader);
mappingContext.setBeanClassLoader(beanClassLoader);
mappingContext.initialize(); // this is necessary here
@@ -44,12 +44,12 @@ public class CassandraMappingContextFactoryBean implements FactoryBean<Cassandra
return true;
}
public Set<String> getBasePackages() {
return basePackages;
public Set<String> getEntityBasePackages() {
return entityBasePackages;
}
public void setBasePackages(Set<String> basePackages) {
this.basePackages = basePackages == null ? new HashSet<String>() : new HashSet<String>(basePackages);
public void setEntityBasePackages(Set<String> basePackages) {
this.entityBasePackages = basePackages == null ? new HashSet<String>() : new HashSet<String>(basePackages);
}
public Mapping getMapping() {
@@ -63,11 +63,11 @@ public class CassandraMappingContextFactoryBean implements FactoryBean<Cassandra
this.mapping = mapping;
}
public ClassLoader getEntityClassLoader() {
return entityClassLoader;
public ClassLoader getBeanClassLoader() {
return beanClassLoader;
}
public void setEntityClassLoader(ClassLoader entityClassLoader) {
this.entityClassLoader = entityClassLoader;
public void setBeanClassLoader(ClassLoader entityClassLoader) {
this.beanClassLoader = entityClassLoader;
}
}

10
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractSpringDataCassandraConfiguration.java
View File

@@ -59,7 +59,7 @@ public abstract class AbstractSpringDataCassandraConfiguration extends AbstractC
* The base packages to scan for entities annotated with {@link Table} annotations. By default, returns the package
* name of {@literal this} (<code>this.getClass().getPackage().getName()</code>). 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<String>(Arrays.asList(getMappingBasePackages())));
bean.setEntityClassLoader(beanClassLoader);
bean.setEntityBasePackages(new HashSet<String>(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 <code>Set&lt;Class&lt;?&gt;&gt;</code> representing the annotated entity classes found.
* @throws ClassNotFoundException
@@ -126,7 +126,7 @@ public abstract class AbstractSpringDataCassandraConfiguration extends AbstractC
protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
CassandraEntityClassScanner entityScanner = getEntityScanner();
entityScanner.setEntityBasePackages(Arrays.asList(getMappingBasePackages()));
entityScanner.setEntityBasePackages(Arrays.asList(getEntityBasePackages()));
return entityScanner.scanForEntityClasses();
}

4
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraMappingContextParser.java
View File

@@ -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<String> basePackageSet = StringUtils.commaDelimitedListToSet(basePackages);
builder.addPropertyValue("basePackages", basePackageSet);
builder.addPropertyValue("entityBasePackages", basePackageSet);
}
protected void parseMapping(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {

4
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/DefaultCassandraMappingContext.java
View File

@@ -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);
}

2
spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.0.xsd
View File

@@ -702,7 +702,7 @@ Defines a CassandraMappingContext for holding rich entity mapping information.
<xsd:element name="entity" type="entityType" minOccurs="0"
maxOccurs="unbounded" />
</xsd:sequence>
<xsd:attribute name="base-packages" type="xsd:string"
<xsd:attribute name="entity-base-packages" type="xsd:string"
use="optional">
<xsd:annotation>
<xsd:documentation><![CDATA[

2
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/composites/CommentRepositoryJavaConfigIntegrationTests.java
View File

@@ -69,7 +69,7 @@ public class CommentRepositoryJavaConfigIntegrationTests extends AbstractSpringD
}
@Override
public String[] getMappingBasePackages() {
public String[] getEntityBasePackages() {
return new String[] { Comment.class.getPackage().getName() };
}
}

2
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/UserRepositoryJavaConfigIntegrationTests.java
View File

@@ -68,7 +68,7 @@ public class UserRepositoryJavaConfigIntegrationTests extends AbstractSpringData
}
@Override
public String[] getMappingBasePackages() {
public String[] getEntityBasePackages() {
return new String[] { User.class.getPackage().getName() };
}
}

2
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraDataOperationsTest.java
View File

@@ -66,7 +66,7 @@ public class CassandraDataOperationsTest extends AbstractSpringDataEmbeddedCassa
}
@Override
public String[] getMappingBasePackages() {
public String[] getEntityBasePackages() {
return new String[] { Book.class.getPackage().getName() };
}
}

2
spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/composites/CommentRepositoryXmlConfigIntegrationTests-context.xml
View File

@@ -12,7 +12,7 @@
<import resource="classpath:/spring-data-cassandra-basic.xml" />
<cass:mapping
base-packages="org.springframework.data.cassandra.test.integration.composites">
entity-base-packages="org.springframework.data.cassandra.test.integration.composites">
<cass:entity
class="org.springframework.data.cassandra.test.integration.composites.Comment">
<cass:table name="comments_x" />

2
spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/UserRepositoryXmlConfigIntegrationTests-context.xml
View File

@@ -13,7 +13,7 @@
<import resource="classpath:/spring-data-cassandra-basic.xml" />
<cass:mapping
base-packages="org.springframework.data.cassandra.test.integration.repository">
entity-base-packages="org.springframework.data.cassandra.test.integration.repository">
<cass:entity
class="org.springframework.data.cassandra.test.integration.repository.User">
<cass:table name="users_x" />