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

DATACASS-357 - Polish.

Browse Source
This commit is contained in:
John Blum
2016-11-28 17:30:27 -08:00
parent db7af357f8
commit ff69fb2423
4 changed files with 63 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraConverter.java
View File

@@ -1,12 +1,12 @@
/*
* Copyright 2013-2014 the original author or authors
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,7 +23,7 @@ import org.springframework.data.util.TypeInformation;
/**
* Central Cassandra specific converter interface from Object to Row.
*
*
* @author Alex Shvid
* @author Matthew T. Adams
* @author Mark Paluch
@@ -66,16 +66,16 @@ public interface CassandraConverter
/**
* Converts the given object into one Cassandra will be able to store natively in a column.
*
* @param obj can be {@literal null}.
* @param typeInformation must not be {@literal null}.
* @return
* @param obj {@link Object} to convert; can be {@literal null}.
* @param typeInformation {@link TypeInformation} used to describe the object type; must not be {@literal null}.
* @return the result of the conversion.
* @since 1.5
*/
Object convertToCassandraColumn(Object obj, TypeInformation<?> typeInformation);
/**
* Returns the {@link CustomConversions} registered in the {@link CassandraConverter}.
*
*
* @return the {@link CustomConversions}.
*/
CustomConversions getCustomConversions();

4
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CustomConversions.java
View File

@@ -106,8 +106,8 @@ public class CustomConversions {
toRegister.addAll(Jsr310Converters.getConvertersToRegister());
toRegister.addAll(ThreeTenBackPortConverters.getConvertersToRegister());
for (Object c : toRegister) {
registerConversion(c);
for (Object converter : toRegister) {
registerConversion(converter);
}
Collections.reverse(toRegister);

90
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java
View File

@@ -22,6 +22,19 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import com.datastax.driver.core.CodecRegistry;
import com.datastax.driver.core.DataType;
import com.datastax.driver.core.Row;
import com.datastax.driver.core.TypeCodec;
import com.datastax.driver.core.UDTValue;
import com.datastax.driver.core.UserType;
import com.datastax.driver.core.querybuilder.Clause;
import com.datastax.driver.core.querybuilder.Delete;
import com.datastax.driver.core.querybuilder.Insert;
import com.datastax.driver.core.querybuilder.QueryBuilder;
import com.datastax.driver.core.querybuilder.Select;
import com.datastax.driver.core.querybuilder.Update;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
@@ -53,19 +66,6 @@ import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.ObjectUtils;
import com.datastax.driver.core.CodecRegistry;
import com.datastax.driver.core.DataType;
import com.datastax.driver.core.Row;
import com.datastax.driver.core.TypeCodec;
import com.datastax.driver.core.UDTValue;
import com.datastax.driver.core.UserType;
import com.datastax.driver.core.querybuilder.Clause;
import com.datastax.driver.core.querybuilder.Delete;
import com.datastax.driver.core.querybuilder.Insert;
import com.datastax.driver.core.querybuilder.QueryBuilder;
import com.datastax.driver.core.querybuilder.Select;
import com.datastax.driver.core.querybuilder.Update;
/**
* {@link CassandraConverter} that uses a {@link MappingContext} to do sophisticated mapping of domain objects to
* {@link Row}.
@@ -86,8 +86,8 @@ import com.datastax.driver.core.querybuilder.Update;
public class MappingCassandraConverter extends AbstractCassandraConverter
implements CassandraConverter, ApplicationContextAware, BeanClassLoaderAware {
protected final CassandraMappingContext mappingContext;
protected ApplicationContext applicationContext;
protected final CassandraMappingContext mappingContext;
protected ClassLoader beanClassLoader;
protected SpELContext spELContext;
@@ -126,16 +126,18 @@ public class MappingCassandraConverter extends AbstractCassandraConverter
return (R) row;
}
if (conversions.hasCustomReadTarget(Row.class, rawType) || conversionService.canConvert(Row.class, rawType)) {
return conversionService.convert(row, rawType);
if (getCustomConversions().hasCustomReadTarget(Row.class, rawType)
|| getConversionService().canConvert(Row.class, rawType)) {
return getConversionService().convert(row, rawType);
}
if (typeInfo.isCollectionLike() || typeInfo.isMap()) {
return conversionService.convert(row, type);
return getConversionService().convert(row, type);
}
CassandraPersistentEntity<R> persistentEntity = (CassandraPersistentEntity<R>)
mappingContext.getPersistentEntity(typeInfo);
getMappingContext().getPersistentEntity(typeInfo);
if (persistentEntity == null) {
throw new MappingException(String.format("No mapping metadata found for %s", rawType.getName()));
@@ -279,11 +281,7 @@ public class MappingCassandraConverter extends AbstractCassandraConverter
Assert.notNull(typeInformation, "TypeInformation must not be null!");
if (obj == null) {
return null;
}
if (obj.getClass().isArray()) {
if (obj == null || obj.getClass().isArray()) {
return obj;
}
@@ -295,7 +293,7 @@ public class MappingCassandraConverter extends AbstractCassandraConverter
if (source != null) {
Class<?> beanClassLoaderClass = transformClassToBeanClassLoaderClass(source.getClass());
CassandraPersistentEntity<?> entity = mappingContext.getPersistentEntity(beanClassLoaderClass);
CassandraPersistentEntity<?> entity = getMappingContext().getPersistentEntity(beanClassLoaderClass);
write(source, sink, entity);
}
@@ -434,7 +432,8 @@ public class MappingCassandraConverter extends AbstractCassandraConverter
log.debug("Adding udt.value [{}] - [{}]", property.getColumnName().toCql(), value);
}
TypeCodec<Object> typeCodec = CodecRegistry.DEFAULT_INSTANCE.codecFor(mappingContext.getDataType(property));
TypeCodec<Object> typeCodec = CodecRegistry.DEFAULT_INSTANCE.codecFor(
getMappingContext().getDataType(property));
udtValue.set(property.getColumnName().toCql(), value, typeCodec);
}
@@ -474,13 +473,12 @@ public class MappingCassandraConverter extends AbstractCassandraConverter
Class<?> targetType = getTargetType(idProperty);
if (conversionService.canConvert(id.getClass(), targetType)) {
return Collections.singleton(
QueryBuilder.eq(idProperty.getColumnName().toCql(), getPotentiallyConvertedSimpleValue(id, targetType)));
if (getConversionService().canConvert(id.getClass(), targetType)) {
return Collections.singleton(QueryBuilder.eq(idProperty.getColumnName().toCql(),
getPotentiallyConvertedSimpleValue(id, targetType)));
}
return Collections.singleton(QueryBuilder.eq(idProperty.getColumnName().toCql(), id));
}
private Object extractId(Object source, CassandraPersistentEntity<?> entity) {
@@ -611,7 +609,7 @@ public class MappingCassandraConverter extends AbstractCassandraConverter
PersistentPropertyAccessor propertyAccessor = (source instanceof PersistentPropertyAccessor
? (PersistentPropertyAccessor) source : entity.getPropertyAccessor(source));
return new ConvertingPropertyAccessor(propertyAccessor, conversionService);
return new ConvertingPropertyAccessor(propertyAccessor, getConversionService());
}
/**
@@ -626,16 +624,17 @@ public class MappingCassandraConverter extends AbstractCassandraConverter
private Class<?> getTargetType(CassandraPersistentProperty property) {
if (conversions.hasCustomWriteTarget(property.getType())) {
return conversions.getCustomWriteTarget(property.getType());
if (getCustomConversions().hasCustomWriteTarget(property.getType())) {
return getCustomConversions().getCustomWriteTarget(property.getType());
}
if (property.findAnnotation(CassandraType.class) != null) {
return getPropertyTargetType(property);
}
if (property.isCompositePrimaryKey() || conversions.isSimpleType(property.getType())
if (property.isCompositePrimaryKey() || getCustomConversions().isSimpleType(property.getType())
|| property.isCollectionLike()) {
return property.getType();
}
@@ -644,13 +643,13 @@ public class MappingCassandraConverter extends AbstractCassandraConverter
private Class<?> getPropertyTargetType(CassandraPersistentProperty property) {
DataType dataType = mappingContext.getDataType(property);
DataType dataType = getMappingContext().getDataType(property);
if (dataType instanceof UserType) {
return property.getType();
}
TypeCodec<Object> codec = CodecRegistry.DEFAULT_INSTANCE.codecFor(mappingContext.getDataType(property));
TypeCodec<Object> codec = CodecRegistry.DEFAULT_INSTANCE.codecFor(getMappingContext().getDataType(property));
return codec.getJavaType().getRawType();
}
@@ -683,7 +682,7 @@ public class MappingCassandraConverter extends AbstractCassandraConverter
return null;
}
if (conversions.isSimpleType(value.getClass())) {
if (getCustomConversions().isSimpleType(value.getClass())) {
// Doesn't need conversion
return getPotentiallyConvertedSimpleValue(value, typeInformation.getType());
}
@@ -692,7 +691,7 @@ public class MappingCassandraConverter extends AbstractCassandraConverter
return getConversionService().convert(value, getCustomConversions().getCustomWriteTarget(value.getClass()));
}
TypeInformation<?> type = typeInformation != null ? typeInformation : ClassTypeInformation.from(value.getClass());
TypeInformation<?> type = (typeInformation != null ? typeInformation : ClassTypeInformation.from(value.getClass()));
TypeInformation<?> actualType = type.getActualType();
if (value instanceof Collection) {
@@ -700,8 +699,8 @@ public class MappingCassandraConverter extends AbstractCassandraConverter
Collection<Object> original = (Collection<Object>) value;
Collection<Object> converted = CollectionFactory.createCollection(getCollectionType(type), original.size());
for (Object o : original) {
converted.add(convertToCassandraColumn(o, actualType));
for (Object element : original) {
converted.add(convertToCassandraColumn(element, actualType));
}
return converted;
@@ -712,6 +711,7 @@ public class MappingCassandraConverter extends AbstractCassandraConverter
if (persistentEntity != null && persistentEntity.isUserDefinedType()) {
UDTValue udtValue = persistentEntity.getUserType().newValue();
write(value, udtValue, persistentEntity);
return udtValue;
@@ -726,7 +726,6 @@ public class MappingCassandraConverter extends AbstractCassandraConverter
*
* @param value may be {@literal null}.
* @param requestedTargetType must not be {@literal null}.
* @return
* @see CassandraType
*/
private Object getPotentiallyConvertedSimpleValue(Object value, Class<?> requestedTargetType) {
@@ -735,17 +734,18 @@ public class MappingCassandraConverter extends AbstractCassandraConverter
return null;
}
if (conversions.hasCustomWriteTarget(value.getClass(), requestedTargetType)) {
return conversionService.convert(value, conversions.getCustomWriteTarget(value.getClass(), requestedTargetType));
if (getCustomConversions().hasCustomWriteTarget(value.getClass(), requestedTargetType)) {
return getConversionService().convert(value,
getCustomConversions().getCustomWriteTarget(value.getClass(), requestedTargetType));
}
// Cassandra has no default enum handling - convert it either to string
// or - if requested - to a different type
if (Enum.class.isAssignableFrom(value.getClass())) {
if (requestedTargetType != null && !requestedTargetType.isEnum()
&& conversionService.canConvert(value.getClass(), requestedTargetType)) {
return conversionService.convert(value, requestedTargetType);
&& getConversionService().canConvert(value.getClass(), requestedTargetType)) {
return getConversionService().convert(value, requestedTargetType);
}
return ((Enum<?>) value).name();

19
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java
View File

@@ -18,6 +18,11 @@ package org.springframework.data.cassandra.repository.query;
import java.util.Iterator;
import java.util.Set;
import com.datastax.driver.core.CodecRegistry;
import com.datastax.driver.core.DataType;
import com.datastax.driver.core.DataType.CollectionType;
import com.datastax.driver.core.TypeCodec;
import org.springframework.data.cassandra.convert.CassandraConverter;
import org.springframework.data.cassandra.mapping.CassandraMappingContext;
import org.springframework.data.cassandra.mapping.CassandraPersistentProperty;
@@ -28,11 +33,6 @@ import org.springframework.data.domain.Sort;
import org.springframework.data.util.ClassTypeInformation;
import org.springframework.data.util.TypeInformation;
import com.datastax.driver.core.CodecRegistry;
import com.datastax.driver.core.DataType;
import com.datastax.driver.core.DataType.CollectionType;
import com.datastax.driver.core.TypeCodec;
/**
* Custom {@link org.springframework.data.repository.query.ParameterAccessor} that uses a {@link CassandraConverter} to
* convert parameters.
@@ -137,19 +137,16 @@ class ConvertingParameterAccessor implements CassandraParameterAccessor {
@SuppressWarnings("unchecked")
private Object potentiallyConvert(int index, Object bindableValue, CassandraPersistentProperty property) {
if (bindableValue == null) {
return null;
}
return converter.convertToCassandraColumn(bindableValue, findTypeInformation(index, bindableValue, property));
return (bindableValue == null ? null
: converter.convertToCassandraColumn(bindableValue, findTypeInformation(index, bindableValue, property)));
}
private TypeInformation<?> findTypeInformation(int index, Object bindableValue,
CassandraPersistentProperty property) {
if (delegate.findCassandraType(index) != null) {
TypeCodec<?> typeCodec = CodecRegistry.DEFAULT_INSTANCE.codecFor(getDataType(index, property));
if (typeCodec.getJavaType().getType() instanceof Class<?>) {
return ClassTypeInformation.from((Class<?>) typeCodec.getJavaType().getType());
}