From b995ff140f4342ad6536d5e3881c7e9661c26114 Mon Sep 17 00:00:00 2001 From: Stephan Wienczny Date: Fri, 14 Mar 2014 14:20:29 +0100 Subject: [PATCH 1/2] DATACASS-110 Fix BeanWrapper usage. --- .../cassandra/convert/MappingCassandraConverter.java | 12 ++++++------ .../data/cassandra/core/CassandraTemplate.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java index b80158f5d..cbb0f5e63 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java @@ -168,7 +168,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; } @@ -177,7 +177,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, @@ -243,7 +243,7 @@ protected void writeInsertFromWrapper(final BeanWrapper 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 @@ -361,7 +361,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())); } } }); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java index 1a8f6b390..5fe09dd79 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java @@ -322,7 +322,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()))); } }); From 3de752d1c069a1e5620e6dc114ee9d5bbc800df8 Mon Sep 17 00:00:00 2001 From: Stephan Wienczny Date: Fri, 14 Mar 2014 14:22:03 +0100 Subject: [PATCH 2/2] DATACASS-110 Remove obsolete useFieldAccessOnly --- .../convert/MappingCassandraConverter.java | 9 --------- .../data/cassandra/core/CassandraTemplate.java | 14 -------------- 2 files changed, 23 deletions(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java index cbb0f5e63..53a813471 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java @@ -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; @@ -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 read(Class type, Object row) { if (row instanceof Row) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java index 5fe09dd79..7a6b17973 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java @@ -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 @@ -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();