Skip to content

Fix DATACLASS-110 and remove obsolete code #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix DATACLASS-110 and remove obsolete code #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b995ff1
DATACASS-110 Fix BeanWrapper usage.
wienczny Mar 14, 2014
3de752d
DATACASS-110 Remove obsolete useFieldAccessOnly
wienczny Mar 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 6 additions & 15 deletions ...a/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ public class MappingCassandraConverter extends AbstractCassandraConverter implem
protected final CassandraMappingContext mappingContext;
protected ApplicationContext applicationContext;
protected SpELContext spELContext;
protected boolean useFieldAccessOnly = true;

protected ClassLoader beanClassLoader;

Expand Down Expand Up @@ -168,7 +167,7 @@ protected void readPropertyFromRow(final CassandraPersistentEntity<?> entity, fi
readPropertiesFromRow(prop.getCompositePrimaryKeyEntity(), row, keyWrapper);

// now that the key's properties have been populated, set the key property on the entity
wrapper.setProperty(keyProperty, keyWrapper.getBean(), useFieldAccessOnly);
wrapper.setProperty(keyProperty, keyWrapper.getBean());
return;
}

Expand All @@ -177,7 +176,7 @@ protected void readPropertyFromRow(final CassandraPersistentEntity<?> entity, fi
}

Object obj = row.getPropertyValue(prop);
wrapper.setProperty(prop, obj, useFieldAccessOnly);
wrapper.setProperty(prop, obj);
}

protected Object instantiatePrimaryKey(CassandraPersistentEntity<?> entity, CassandraPersistentProperty keyProperty,
Expand All @@ -189,14 +188,6 @@ protected Object instantiatePrimaryKey(CassandraPersistentEntity<?> entity, Cass
propertyProvider, null));
}

public boolean getUseFieldAccessOnly() {
return useFieldAccessOnly;
}

public void setUseFieldAccessOnly(boolean useFieldAccessOnly) {
this.useFieldAccessOnly = useFieldAccessOnly;
}

@Override
public <R> R read(Class<R> type, Object row) {
if (row instanceof Row) {
Expand Down Expand Up @@ -243,7 +234,7 @@ protected void writeInsertFromWrapper(final BeanWrapper<CassandraPersistentEntit
@Override
public void doWithPersistentProperty(CassandraPersistentProperty prop) {

Object value = wrapper.getProperty(prop, prop.getType(), useFieldAccessOnly);
Object value = wrapper.getProperty(prop, prop.getType());

if (prop.isCompositePrimaryKey()) {
writeInsertFromWrapper(
Expand Down Expand Up @@ -272,7 +263,7 @@ protected void writeUpdateFromWrapper(final BeanWrapper<CassandraPersistentEntit
@Override
public void doWithPersistentProperty(CassandraPersistentProperty prop) {

Object value = wrapper.getProperty(prop, prop.getType(), useFieldAccessOnly);
Object value = wrapper.getProperty(prop, prop.getType());

if (prop.isCompositePrimaryKey()) {
writeUpdateFromWrapper(
Expand Down Expand Up @@ -351,7 +342,7 @@ public Object getId(Object object, CassandraPersistentEntity<?> entity) {

CassandraPersistentProperty idProperty = entity.getIdProperty();
if (idProperty != null) {
return wrapper.getProperty(entity.getIdProperty(), idProperty.getType(), useFieldAccessOnly);
return wrapper.getProperty(entity.getIdProperty(), idProperty.getType());
}

// if the class doesn't have an id property, then it's using MapId
Expand All @@ -361,7 +352,7 @@ public Object getId(Object object, CassandraPersistentEntity<?> entity) {
@Override
public void doWithPersistentProperty(CassandraPersistentProperty p) {
if (p.isPrimaryKeyColumn()) {
id.with(p.getName(), (Serializable) wrapper.getProperty(p, p.getType(), useFieldAccessOnly));
id.with(p.getName(), (Serializable) wrapper.getProperty(p, p.getType()));
}
}
});
Expand Down
16 changes: 1 addition & 15 deletions ...ta-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ public class CassandraTemplate extends CqlTemplate implements CassandraOperation

protected CassandraConverter cassandraConverter;
protected CassandraMappingContext mappingContext;
protected boolean useFieldAccessOnly = false;

/**
* Default Constructor for wiring in the required components later
Expand Down Expand Up @@ -98,19 +97,6 @@ public CassandraMappingContext getCassandraMappingContext() {
return mappingContext;
}

public boolean getUseFieldAccessOnly() {
return useFieldAccessOnly;
}

/**
* Whether only fields should be used when accessing a persistent entity's data.
*
* @param useFieldAccessOnly
*/
public void setUseFieldAccessOnly(boolean useFieldAccessOnly) {
this.useFieldAccessOnly = useFieldAccessOnly;
}

@Override
public void afterPropertiesSet() {
super.afterPropertiesSet();
Expand Down Expand Up @@ -322,7 +308,7 @@ protected void appendIdCriteria(final ClauseCallback clauseCallback, CassandraPe
public void doWithPersistentProperty(CassandraPersistentProperty p) {

clauseCallback.doWithClause(QueryBuilder.eq(p.getColumnName().toCql(),
idWrapper.getProperty(p, p.getActualType(), useFieldAccessOnly)));
idWrapper.getProperty(p, p.getActualType())));
}
});

Expand Down